Merge commit 'v2.6.38-rc6' into for-2.6.39/core

Conflicts:
	block/cfq-iosched.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

1 files changed, 3 insertions, 15 deletions

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 4a3842212c50..9045c52abd25 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1278,11 +1278,10 @@ static inline int scsi_target_queue_ready(struct Scsi_Host *shost,
         }
 
         if (scsi_target_is_busy(starget)) {
-                if (list_empty(&sdev->starved_entry)) {
+                if (list_empty(&sdev->starved_entry))
                         list_add_tail(&sdev->starved_entry,
                                       &shost->starved_list);
-                        return 0;
-                }
+                return 0;
         }
 
         /* We're OK to process the command, so we can't be starved */
@@ -1978,8 +1977,7 @@ EXPORT_SYMBOL(scsi_mode_sense);
  *              in.
  *
  *      Returns zero if unsuccessful or an error if TUR failed.  For
- *      removable media, a return of NOT_READY or UNIT_ATTENTION is
- *      translated to success, with the ->changed flag updated.
+ *      removable media, UNIT_ATTENTION sets ->changed flag.
  **/
 int
 scsi_test_unit_ready(struct scsi_device *sdev, int timeout, int retries,
@@ -2006,16 +2004,6 @@ scsi_test_unit_ready(struct scsi_device *sdev, int timeout, int retries,
         } while (scsi_sense_valid(sshdr) &&
                  sshdr->sense_key == UNIT_ATTENTION && --retries);
 
-        if (!sshdr)
-                /* could not allocate sense buffer, so can't process it */
-                return result;
-
-        if (sdev->removable && scsi_sense_valid(sshdr) &&
-            (sshdr->sense_key == UNIT_ATTENTION ||
-             sshdr->sense_key == NOT_READY)) {
-                sdev->changed = 1;
-                result = 0;
-        }
         if (!sshdr_external)
                 kfree(sshdr);
         return result;