From: Alan Stern Update the way the scsi_test_unit_ready() routine reports medium not present, using the technique recommended by James Bottomley. Signed-off-by: Alan Stern Cc: James Bottomley Cc: Jens Axboe Signed-off-by: Andrew Morton --- drivers/scsi/scsi_ioctl.c | 2 +- drivers/scsi/scsi_lib.c | 8 ++++---- drivers/scsi/sd.c | 6 ++++-- drivers/scsi/sr.c | 6 ++++-- include/scsi/scsi_device.h | 3 +-- 5 files changed, 14 insertions(+), 11 deletions(-) diff -puN drivers/scsi/scsi_ioctl.c~scsi-early-detection-of-medium-not-present-updated drivers/scsi/scsi_ioctl.c --- a/drivers/scsi/scsi_ioctl.c~scsi-early-detection-of-medium-not-present-updated +++ a/drivers/scsi/scsi_ioctl.c @@ -239,7 +239,7 @@ int scsi_ioctl(struct scsi_device *sdev, return scsi_set_medium_removal(sdev, SCSI_REMOVAL_ALLOW); case SCSI_IOCTL_TEST_UNIT_READY: return scsi_test_unit_ready(sdev, IOCTL_NORMAL_TIMEOUT, - NORMAL_RETRIES); + NORMAL_RETRIES, NULL); case SCSI_IOCTL_START_UNIT: scsi_cmd[0] = START_STOP; scsi_cmd[1] = 0; diff -puN drivers/scsi/scsi_lib.c~scsi-early-detection-of-medium-not-present-updated drivers/scsi/scsi_lib.c --- a/drivers/scsi/scsi_lib.c~scsi-early-detection-of-medium-not-present-updated +++ a/drivers/scsi/scsi_lib.c @@ -1876,7 +1876,8 @@ scsi_mode_sense(struct scsi_device *sdev EXPORT_SYMBOL(scsi_mode_sense); int -scsi_test_unit_ready(struct scsi_device *sdev, int timeout, int retries) +scsi_test_unit_ready(struct scsi_device *sdev, int timeout, int retries, + int *media_not_present) { char cmd[] = { TEST_UNIT_READY, 0, 0, 0, 0, 0, @@ -1887,7 +1888,6 @@ scsi_test_unit_ready(struct scsi_device result = scsi_execute_req(sdev, cmd, DMA_NONE, NULL, 0, &sshdr, timeout, retries); - sdev->medium_not_present = 0; if ((driver_byte(result) & DRIVER_SENSE) && sdev->removable) { if ((scsi_sense_valid(&sshdr)) && @@ -1896,8 +1896,8 @@ scsi_test_unit_ready(struct scsi_device sdev->changed = 1; result = 0; - if (sshdr.asc == 0x3A) - sdev->medium_not_present = 1; + if (sshdr.asc == 0x3A && media_not_present != NULL) + *media_not_present = 1; } } return result; diff -puN drivers/scsi/sd.c~scsi-early-detection-of-medium-not-present-updated drivers/scsi/sd.c --- a/drivers/scsi/sd.c~scsi-early-detection-of-medium-not-present-updated +++ a/drivers/scsi/sd.c @@ -732,6 +732,7 @@ static int sd_media_changed(struct gendi struct scsi_disk *sdkp = scsi_disk(disk); struct scsi_device *sdp = sdkp->device; int retval; + int media_not_present = 0; SCSI_LOG_HLQUEUE(3, printk("sd_media_changed: disk=%s\n", disk->disk_name)); @@ -759,7 +760,8 @@ static int sd_media_changed(struct gendi */ retval = -ENODEV; if (scsi_block_when_processing_errors(sdp)) - retval = scsi_test_unit_ready(sdp, SD_TIMEOUT, SD_MAX_RETRIES); + retval = scsi_test_unit_ready(sdp, SD_TIMEOUT, SD_MAX_RETRIES, + &media_not_present); /* * Unable to test, unit probably not ready. This usually @@ -767,7 +769,7 @@ static int sd_media_changed(struct gendi * and we will figure it out later once the drive is * available again. */ - if (retval || sdp->medium_not_present) + if (retval || media_not_present) goto not_present; /* * For removable scsi disk we have to recognise the presence diff -puN drivers/scsi/sr.c~scsi-early-detection-of-medium-not-present-updated drivers/scsi/sr.c --- a/drivers/scsi/sr.c~scsi-early-detection-of-medium-not-present-updated +++ a/drivers/scsi/sr.c @@ -178,14 +178,16 @@ static int sr_media_change(struct cdrom_ { struct scsi_cd *cd = cdi->handle; int retval; + int media_not_present = 0; if (CDSL_CURRENT != slot) { /* no changer support */ return -EINVAL; } - retval = scsi_test_unit_ready(cd->device, SR_TIMEOUT, MAX_RETRIES); - if (retval) { + retval = scsi_test_unit_ready(cd->device, SR_TIMEOUT, MAX_RETRIES, + &media_not_present); + if (retval || media_not_present) { /* Unable to test, unit probably not ready. This usually * means there is no disc in the drive. Mark as changed, * and we will figure it out later once the drive is diff -puN include/scsi/scsi_device.h~scsi-early-detection-of-medium-not-present-updated include/scsi/scsi_device.h --- a/include/scsi/scsi_device.h~scsi-early-detection-of-medium-not-present-updated +++ a/include/scsi/scsi_device.h @@ -92,7 +92,6 @@ struct scsi_device { unsigned writeable:1; unsigned removable:1; unsigned changed:1; /* Data invalid due to media change */ - unsigned medium_not_present:1; /* Set by scsi_test_unit_ready() */ unsigned busy:1; /* Used to prevent races */ unsigned lockable:1; /* Able to prevent media removal */ unsigned locked:1; /* Media removal disabled */ @@ -268,7 +267,7 @@ extern int scsi_mode_select(struct scsi_ struct scsi_mode_data *data, struct scsi_sense_hdr *); extern int scsi_test_unit_ready(struct scsi_device *sdev, int timeout, - int retries); + int retries, int *media_not_present); extern int scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state); extern int scsi_device_quiesce(struct scsi_device *sdev); _