Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (87 commits)
  [SCSI] fusion: fix domain validation loops
  [SCSI] qla2xxx: fix regression on sparc64
  [SCSI] modalias for scsi devices
  [SCSI] sg: cap reserved_size values at max_sectors
  [SCSI] BusLogic: stop using check_region
  [SCSI] tgt: fix rdma transfer bugs
  [SCSI] aacraid: fix aacraid not finding device
  [SCSI] aacraid: Correct SMC products in aacraid.txt
  [SCSI] scsi_error.c: Add EH Start Unit retry
  [SCSI] aacraid: [Fastboot] Panics for AACRAID driver during 'insmod' for kexec test.
  [SCSI] ipr: Driver version to 2.3.2
  [SCSI] ipr: Faster sg list fetch
  [SCSI] ipr: Return better qc_issue errors
  [SCSI] ipr: Disrupt device error
  [SCSI] ipr: Improve async error logging level control
  [SCSI] ipr: PCI unblock config access fix
  [SCSI] ipr: Fix for oops following SATA request sense
  [SCSI] ipr: Log error for SAS dual path switch
  [SCSI] ipr: Enable logging of debug error data for all devices
  [SCSI] ipr: Add new PCI-E IDs to device table
  ...

1 files changed, 13 insertions, 24 deletions

diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c
index a39a478bb39a..6d223dd76440 100644
--- a/drivers/scsi/ibmvscsi/ibmvstgt.c
+++ b/drivers/scsi/ibmvscsi/ibmvstgt.c
@@ -35,7 +35,7 @@
 #include "ibmvscsi.h"
 
 #define INITIAL_SRP_LIMIT       16
-#define DEFAULT_MAX_SECTORS     512
+#define DEFAULT_MAX_SECTORS     256
 
 #define TGT_NAME        "ibmvstgt"
 
@@ -248,8 +248,8 @@ static int ibmvstgt_rdma(struct scsi_cmnd *sc, struct scatterlist *sg, int nsg,
                                                   md[i].va + mdone);
 
                         if (err != H_SUCCESS) {
-                                eprintk("rdma error %d %d\n", dir, slen);
-                                goto out;
+                                eprintk("rdma error %d %d %ld\n", dir, slen, err);
+                                return -EIO;
                         }
 
                         mlen -= slen;
@@ -265,45 +265,35 @@ static int ibmvstgt_rdma(struct scsi_cmnd *sc, struct scatterlist *sg, int nsg,
                                 if (sidx > nsg) {
                                         eprintk("out of sg %p %d %d\n",
                                                 iue, sidx, nsg);
-                                        goto out;
+                                        return -EIO;
                                 }
                         }
                 };
 
                 rest -= mlen;
         }
-out:
-
         return 0;
 }
 
-static int ibmvstgt_transfer_data(struct scsi_cmnd *sc,
-                                  void (*done)(struct scsi_cmnd *))
-{
-        struct iu_entry *iue = (struct iu_entry *) sc->SCp.ptr;
-        int err;
-
-        err = srp_transfer_data(sc, &vio_iu(iue)->srp.cmd, ibmvstgt_rdma, 1, 1);
-
-        done(sc);
-
-        return err;
-}
-
 static int ibmvstgt_cmd_done(struct scsi_cmnd *sc,
                              void (*done)(struct scsi_cmnd *))
 {
         unsigned long flags;
         struct iu_entry *iue = (struct iu_entry *) sc->SCp.ptr;
         struct srp_target *target = iue->target;
+        int err = 0;
 
-        dprintk("%p %p %x\n", iue, target, vio_iu(iue)->srp.cmd.cdb[0]);
+        dprintk("%p %p %x %u\n", iue, target, vio_iu(iue)->srp.cmd.cdb[0],
+                cmd->usg_sg);
+
+        if (sc->use_sg)
+                err = srp_transfer_data(sc, &vio_iu(iue)->srp.cmd, ibmvstgt_rdma, 1, 1);
 
         spin_lock_irqsave(&target->lock, flags);
         list_del(&iue->ilist);
         spin_unlock_irqrestore(&target->lock, flags);
 
-        if (sc->result != SAM_STAT_GOOD) {
+        if (err|| sc->result != SAM_STAT_GOOD) {
                 eprintk("operation failed %p %d %x\n",
                         iue, sc->result, vio_iu(iue)->srp.cmd.cdb[0]);
                 send_rsp(iue, sc, HARDWARE_ERROR, 0x00);
@@ -503,7 +493,8 @@ static void process_iu(struct viosrp_crq *crq, struct srp_target *target)
 {
         struct vio_port *vport = target_to_port(target);
         struct iu_entry *iue;
-        long err, done;
+        long err;
+        int done = 1;
 
         iue = srp_iu_get(target);
         if (!iue) {
@@ -518,7 +509,6 @@ static void process_iu(struct viosrp_crq *crq, struct srp_target *target)
 
         if (err != H_SUCCESS) {
                 eprintk("%ld transferring data error %p\n", err, iue);
-                done = 1;
                 goto out;
         }
 
@@ -794,7 +784,6 @@ static struct scsi_host_template ibmvstgt_sht = {
         .use_clustering         = DISABLE_CLUSTERING,
         .max_sectors            = DEFAULT_MAX_SECTORS,
         .transfer_response      = ibmvstgt_cmd_done,
-        .transfer_data          = ibmvstgt_transfer_data,
         .eh_abort_handler       = ibmvstgt_eh_abort_handler,
         .tsk_mgmt_response      = ibmvstgt_tsk_mgmt_response,
         .shost_attrs            = ibmvstgt_attrs,