Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 16 insertions, 6 deletions

diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index d8d98cfecada..13b8bcdf3dba 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -113,7 +113,7 @@ static int slave_alloc (struct scsi_device *sdev)
          * Let the scanning code know if this target merely sets
          * Peripheral Device Type to 0x1f to indicate no LUN.
          */
-        if (us->subclass == US_SC_UFI)
+        if (us->subclass == USB_SC_UFI)
                 sdev->sdev_target->pdt_1f_for_no_lun = 1;
 
         return 0;
@@ -123,7 +123,7 @@ static int slave_configure(struct scsi_device *sdev)
 {
         struct us_data *us = host_to_us(sdev->host);
 
-        /* Many devices have trouble transfering more than 32KB at a time,
+        /* Many devices have trouble transferring more than 32KB at a time,
          * while others have trouble with more than 64K. At this time we
          * are limiting both to 32K (64 sectores).
          */
@@ -176,7 +176,7 @@ static int slave_configure(struct scsi_device *sdev)
                 /* Disk-type devices use MODE SENSE(6) if the protocol
                  * (SubClass) is Transparent SCSI, otherwise they use
                  * MODE SENSE(10). */
-                if (us->subclass != US_SC_SCSI && us->subclass != US_SC_CYP_ATACB)
+                if (us->subclass != USB_SC_SCSI && us->subclass != USB_SC_CYP_ATACB)
                         sdev->use_10_for_ms = 1;
 
                 /* Many disks only accept MODE SENSE transfer lengths of
@@ -209,6 +209,10 @@ static int slave_configure(struct scsi_device *sdev)
                 if (us->fflags & US_FL_CAPACITY_HEURISTICS)
                         sdev->guess_capacity = 1;
 
+                /* Some devices cannot handle READ_CAPACITY_16 */
+                if (us->fflags & US_FL_NO_READ_CAPACITY_16)
+                        sdev->no_read_capacity_16 = 1;
+
                 /* assume SPC3 or latter devices support sense size > 18 */
                 if (sdev->scsi_level > SCSI_SPC_2)
                         us->fflags |= US_FL_SANE_SENSE;
@@ -245,7 +249,7 @@ static int slave_configure(struct scsi_device *sdev)
                  * capacity will be decremented or is correct. */
                 if (!(us->fflags & (US_FL_FIX_CAPACITY | US_FL_CAPACITY_OK |
                                         US_FL_SCM_MULT_TARG)) &&
-                                us->protocol == US_PR_BULK)
+                                us->protocol == USB_PR_BULK)
                         us->use_last_sector_hacks = 1;
         } else {
 
@@ -253,6 +257,10 @@ static int slave_configure(struct scsi_device *sdev)
                  * or to force 192-byte transfer lengths for MODE SENSE.
                  * But they do need to use MODE SENSE(10). */
                 sdev->use_10_for_ms = 1;
+
+                /* Some (fake) usb cdrom devices don't like READ_DISC_INFO */
+                if (us->fflags & US_FL_NO_READ_DISC_INFO)
+                        sdev->no_read_disc_info = 1;
         }
 
         /* The CB and CBI transports have no way to pass LUN values
@@ -261,7 +269,7 @@ static int slave_configure(struct scsi_device *sdev)
          * scsi_level == 0 (UNKNOWN).  Hence such devices must necessarily
          * be single-LUN.
          */
-        if ((us->protocol == US_PR_CB || us->protocol == US_PR_CBI) &&
+        if ((us->protocol == USB_PR_CB || us->protocol == USB_PR_CBI) &&
                         sdev->scsi_level == SCSI_UNKNOWN)
                 us->max_lun = 0;
 
@@ -277,7 +285,7 @@ static int slave_configure(struct scsi_device *sdev)
 
 /* queue a command */
 /* This is always called with scsi_lock(host) held */
-static int queuecommand(struct scsi_cmnd *srb,
+static int queuecommand_lck(struct scsi_cmnd *srb,
                         void (*done)(struct scsi_cmnd *))
 {
         struct us_data *us = host_to_us(srb->device->host);
@@ -307,6 +315,8 @@ static int queuecommand(struct scsi_cmnd *srb,
         return 0;
 }
 
+static DEF_SCSI_QCMD(queuecommand)
+
 /***********************************************************************
  * Error handling functions
  ***********************************************************************/