From: Alan Stern This patch (as695) changes the scsi_test_unit_ready() routine in the SCSI core to set a new flag when no medium is present. The sd driver is changed to use this new flag for reporting -ENOMEDIUM in from the sd_media_changed method. Signed-off-by: Alan Stern Cc: James Bottomley Cc: Jens Axboe Signed-off-by: Andrew Morton --- drivers/scsi/scsi_lib.c | 4 ++++ drivers/scsi/sd.c | 5 ++--- include/scsi/scsi_device.h | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff -puN drivers/scsi/scsi_lib.c~scsi-core-and-sd-early-detection-of-medium-not-present drivers/scsi/scsi_lib.c --- a/drivers/scsi/scsi_lib.c~scsi-core-and-sd-early-detection-of-medium-not-present +++ a/drivers/scsi/scsi_lib.c @@ -1887,6 +1887,7 @@ 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)) && @@ -1894,6 +1895,9 @@ scsi_test_unit_ready(struct scsi_device (sshdr.sense_key == NOT_READY))) { sdev->changed = 1; result = 0; + + if (sshdr.asc == 0x3A) + sdev->medium_not_present = 1; } } return result; diff -puN drivers/scsi/sd.c~scsi-core-and-sd-early-detection-of-medium-not-present drivers/scsi/sd.c --- a/drivers/scsi/sd.c~scsi-core-and-sd-early-detection-of-medium-not-present +++ a/drivers/scsi/sd.c @@ -767,9 +767,8 @@ static int sd_media_changed(struct gendi * and we will figure it out later once the drive is * available again. */ - if (retval) + if (retval || sdp->medium_not_present) goto not_present; - /* * For removable scsi disk we have to recognise the presence * of a disk in the drive. This is kept in the struct scsi_disk @@ -784,7 +783,7 @@ static int sd_media_changed(struct gendi not_present: set_media_not_present(sdkp); - return 1; + return -ENOMEDIUM; } static int sd_sync_cache(struct scsi_device *sdp) diff -puN include/scsi/scsi_device.h~scsi-core-and-sd-early-detection-of-medium-not-present include/scsi/scsi_device.h --- a/include/scsi/scsi_device.h~scsi-core-and-sd-early-detection-of-medium-not-present +++ a/include/scsi/scsi_device.h @@ -92,6 +92,7 @@ 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 */ _