Fix the bug where CDROMEJECT cannot eject some devices. bug discussion: https://bugzilla.ubuntu.com/show_bug.cgi?id=5049 Patch location: http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commitdiff;h=f431f87fc9ac9ba248f43662ef9da9cdaa3418c2 --- block/scsi_ioctl.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) --- linux-2617-g21.orig/block/scsi_ioctl.c +++ linux-2617-g21/block/scsi_ioctl.c @@ -501,7 +501,7 @@ static int __blk_send_generic(request_qu 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; @@ -521,6 +521,11 @@ static inline int blk_send_start_stop(re 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; @@ -645,7 +650,11 @@ int scsi_cmd_ioctl(struct file *file, st 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; - : send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
