lkml.org 
[lkml]   [2005]   [Dec]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH rc6] block: Fix CDROMEJECT to work in more cases
    This changes the request to a READ instead of WRITE. Also adds and calls
    blk_send_allow_medium_removal() for CDROMEJECT case.

    Signed-off-by: Ben Collins <bcollins@ubuntu.com>

    --- a/block/scsi_ioctl.c~ 2005-12-19 15:44:06.000000000 -0500
    +++ b/block/scsi_ioctl.c 2005-12-19 15:46:43.000000000 -0500
    @@ -449,7 +449,7 @@
    struct request *rq;
    int err;

    - rq = blk_get_request(q, WRITE, __GFP_WAIT);
    + rq = blk_get_request(q, READ, __GFP_WAIT);
    rq->flags |= REQ_BLOCK_PC;
    rq->data = NULL;
    rq->data_len = 0;
    @@ -469,6 +469,11 @@
    return __blk_send_generic(q, bd_disk, GPCMD_START_STOP_UNIT, data);
    }

    +static inline int blk_send_allow_medium_removal(request_queue_t *q, struct gendisk *bd_disk)
    +{
    + return __blk_send_generic(q, bd_disk, GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL, 0);
    +}
    +
    int scsi_cmd_ioctl(struct file *file, struct gendisk *bd_disk, unsigned int cmd, void __user *arg)
    {
    request_queue_t *q;
    @@ -593,7 +598,11 @@
    err = blk_send_start_stop(q, bd_disk, 0x03);
    break;
    case CDROMEJECT:
    - err = blk_send_start_stop(q, bd_disk, 0x02);
    + err = 0;
    +
    + err |= blk_send_allow_medium_removal(q, bd_disk);
    + err |= blk_send_start_stop(q, bd_disk, 0x01);
    + err |= blk_send_start_stop(q, bd_disk, 0x02);
    break;
    default:
    err = -ENOTTY;
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-12-19 22:01    [W:0.043 / U:30.824 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site