The patch titled
sd: early detection of medium not present
has been removed from the -mm tree. Its filename is
sd-early-detection-of-medium-not-present.patch
This patch was dropped because it was nacked by the maintainer
------------------------------------------------------
Subject: sd: early detection of medium not present
From: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
This patch (as696) moves the check for medium not present a bit earlier in the
sd_spinup_disk() routine. The existing code will happily continue probing
even after the device has told it there is no media.
Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/scsi/sd.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff -puN drivers/scsi/sd.c~sd-early-detection-of-medium-not-present drivers/scsi/sd.c
--- a/drivers/scsi/sd.c~sd-early-detection-of-medium-not-present
+++ a/drivers/scsi/sd.c
@@ -1050,6 +1050,14 @@ sd_spinup_disk(struct scsi_disk *sdkp, c
&sshdr, SD_TIMEOUT,
SD_MAX_RETRIES);
+ /*
+ * If the drive has indicated to us that it
+ * doesn't have any media in it, don't bother
+ * with any of the rest of this crap.
+ */
+ if (media_not_present(sdkp, &sshdr))
+ return;
+
if (the_result)
sense_valid = scsi_sense_valid(&sshdr);
retries++;
@@ -1058,14 +1066,6 @@ sd_spinup_disk(struct scsi_disk *sdkp, c
((driver_byte(the_result) & DRIVER_SENSE) &&
sense_valid && sshdr.sense_key == UNIT_ATTENTION)));
- /*
- * If the drive has indicated to us that it doesn't have
- * any media in it, don't bother with any of the rest of
- * this crap.
- */
- if (media_not_present(sdkp, &sshdr))
- return;
-
if ((driver_byte(the_result) & DRIVER_SENSE) == 0) {
/* no sense, TUR either succeeded or failed
* with a status error */
_
Patches currently in -mm which might be from stern@xxxxxxxxxxxxxxxxxxx are
sd-early-detection-of-medium-not-present.patch
scsi-early-detection-of-medium-not-present-updated.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
