Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

9 files changed, 39 insertions, 27 deletions

diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index ab383d1f59e2..3cb68af90456 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -325,6 +325,8 @@ static int aac_biosparm(struct scsi_device *sdev, struct block_device *bdev,
          *      translations ( 64/32, 128/32, 255/63 ).
          */
         buf = scsi_bios_ptable(bdev);
+        if (!buf)
+                return 0;
         if(*(__le16 *)(buf + 0x40) == cpu_to_le16(0xaa55)) {
                 struct partition *first = (struct partition * )buf;
                 struct partition *entry = first;
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 31e9f40e79a2..6aab9dacdeea 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -2105,7 +2105,7 @@ ahd_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
                                           scmd_id(cmd),
                                           scmd_channel(cmd) + 'A',
                                           CAM_LUN_WILDCARD,
-                                          SCB_LIST_NULL, ROLE_INITIATOR) == 0)
+                                          SCB_LIST_NULL, ROLE_INITIATOR))
                                 break;
                 }
         }
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 7fc6454068e4..d866213f42b8 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -2169,7 +2169,7 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
                         if (ahc_match_scb(ahc, pending_scb, scmd_id(cmd),
                                           scmd_channel(cmd) + 'A',
                                           CAM_LUN_WILDCARD,
-                                          SCB_LIST_NULL, ROLE_INITIATOR) == 0)
+                                          SCB_LIST_NULL, ROLE_INITIATOR))
                                 break;
                 }
         }
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 3b4ca55a3332..379e87089764 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -2239,7 +2239,7 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)
         struct scsi_cmnd *cmd = qc->scsicmd;
 
         if ((tf->protocol = ata_scsi_map_proto(scsicmd[1])) == ATA_PROT_UNKNOWN)
-                return 1;
+                goto invalid_fld;
 
         /*
          * 12 and 16 byte CDBs use different offsets to
@@ -2301,7 +2301,7 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)
          */
         if ((tf->command == ATA_CMD_SET_FEATURES)
          && (tf->feature == SETFEATURES_XFER))
-                return 1;
+                goto invalid_fld;
 
         /*
          * Set flags so that all registers will be written,
@@ -2322,6 +2322,11 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)
         qc->nsect = cmd->bufflen / ATA_SECT_SIZE;
 
         return 0;
+
+ invalid_fld:
+        ata_scsi_set_sense(qc->scsicmd, ILLEGAL_REQUEST, 0x24, 0x00);
+        /* "Invalid field in cdb" */
+        return 1;
 }
 
 /**
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index ce9d73a292e2..4afef5cdcb17 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -542,17 +542,10 @@ static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd *cmd)
 
 void scsi_next_command(struct scsi_cmnd *cmd)
 {
-        struct scsi_device *sdev = cmd->device;
-        struct request_queue *q = sdev->request_queue;
-
-        /* need to hold a reference on the device before we let go of the cmd */
-        get_device(&sdev->sdev_gendev);
+        struct request_queue *q = cmd->device->request_queue;
 
         scsi_put_command(cmd);
         scsi_run_queue(q);
-
-        /* ok to remove device now */
-        put_device(&sdev->sdev_gendev);
 }
 
 void scsi_run_host_queues(struct Scsi_Host *shost)
diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c
index 718a2bc4ed5e..38a53b5f9e9a 100644
--- a/drivers/scsi/scsi_transport_spi.c
+++ b/drivers/scsi/scsi_transport_spi.c
@@ -812,12 +812,10 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
         if (!scsi_device_sync(sdev) && !scsi_device_dt(sdev))
                 return;
 
-        /* see if the device has an echo buffer.  If it does we can
-         * do the SPI pattern write tests */
-
-        len = 0;
-        if (scsi_device_dt(sdev))
-                len = spi_dv_device_get_echo_buffer(sdev, buffer);
+        /* len == -1 is the signal that we need to ascertain the
+         * presence of an echo buffer before trying to use it.  len ==
+         * 0 means we don't have an echo buffer */
+        len = -1;
 
  retry:
 
@@ -840,11 +838,23 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
                 if (spi_min_period(starget) == 8)
                         DV_SET(pcomp_en, 1);
         }
+        /* Do the read only INQUIRY tests */
+        spi_dv_retrain(sdev, buffer, buffer + sdev->inquiry_len,
+                       spi_dv_device_compare_inquiry);
+        /* See if we actually managed to negotiate and sustain DT */
+        if (i->f->get_dt)
+                i->f->get_dt(starget);
+
+        /* see if the device has an echo buffer.  If it does we can do
+         * the SPI pattern write tests.  Because of some broken
+         * devices, we *only* try this on a device that has actually
+         * negotiated DT */
+
+        if (len == -1 && spi_dt(starget))
+                len = spi_dv_device_get_echo_buffer(sdev, buffer);
 
-        if (len == 0) {
+        if (len <= 0) {
                 starget_printk(KERN_INFO, starget, "Domain Validation skipping write tests\n");
-                spi_dv_retrain(sdev, buffer, buffer + len,
-                               spi_dv_device_compare_inquiry);
                 return;
         }
 
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 72ec59456e69..b55c2a8a547c 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1860,9 +1860,11 @@ st_map_user_pages(struct scatterlist *sgl, const unsigned int max_pages,
            unlock_page(pages[j]); */
         res = 0;
  out_unmap:
-        if (res > 0)
+        if (res > 0) {
                 for (j=0; j < res; j++)
                         page_cache_release(pages[j]);
+                res = 0;
+        }
         kfree(pages);
         return res;
 }
@@ -1878,8 +1880,6 @@ st_unmap_user_pages(struct scatterlist *sgl, const unsigned int nr_pages,
         for (i=0; i < nr_pages; i++) {
                 struct page *page = sgl[i].page;
 
-                /* XXX: just for debug. Remove when PageReserved is removed */
-                BUG_ON(PageReserved(page));
                 if (dirtied)
                         SetPageDirty(page);
                 /* unlock_page(page); */
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 770c4324f3d5..7ac6ea141fff 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -4509,6 +4509,7 @@ static int sgl_map_user_pages(struct scatterlist *sgl, const unsigned int max_pa
         if (res > 0) {
                 for (j=0; j < res; j++)
                         page_cache_release(pages[j]);
+                res = 0;
         }
         kfree(pages);
         return res;
@@ -4524,8 +4525,6 @@ static int sgl_unmap_user_pages(struct scatterlist *sgl, const unsigned int nr_p
         for (i=0; i < nr_pages; i++) {
                 struct page *page = sgl[i].page;
 
-                /* XXX: just for debug. Remove when PageReserved is removed */
-                BUG_ON(PageReserved(page));
                 if (dirtied)
                         SetPageDirty(page);
                 /* FIXME: cache flush missing for rw==READ
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
index d76766c3ce16..7fc0b97173e1 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -2086,6 +2086,7 @@ static void sym2_set_dt(struct scsi_target *starget, int dt)
         tp->tgoal.check_nego = 1;
 }
 
+#if 0
 static void sym2_set_iu(struct scsi_target *starget, int iu)
 {
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
@@ -2111,7 +2112,7 @@ static void sym2_set_qas(struct scsi_target *starget, int qas)
                 tp->tgoal.qas = 0;
         tp->tgoal.check_nego = 1;
 }
-
+#endif
 
 static struct spi_function_template sym2_transport_functions = {
         .set_offset     = sym2_set_offset,
@@ -2122,10 +2123,12 @@ static struct spi_function_template sym2_transport_functions = {
         .show_width     = 1,
         .set_dt         = sym2_set_dt,
         .show_dt        = 1,
+#if 0
         .set_iu         = sym2_set_iu,
         .show_iu        = 1,
         .set_qas        = sym2_set_qas,
         .show_qas       = 1,
+#endif
         .get_signalling = sym2_get_signalling,
 };