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: (207 commits)
  [SCSI] gdth: fix CONFIG_ISA build failure
  [SCSI] esp_scsi: remove __dev{init,exit}
  [SCSI] gdth: !use_sg cleanup and use of scsi accessors
  [SCSI] gdth: Move members from SCp to gdth_cmndinfo, stage 2
  [SCSI] gdth: Setup proper per-command private data
  [SCSI] gdth: Remove gdth_ctr_tab[]
  [SCSI] gdth: switch to modern scsi host registration
  [SCSI] gdth: gdth_interrupt() gdth_get_status() & gdth_wait() fixes
  [SCSI] gdth: clean up host private data
  [SCSI] gdth: Remove virt hosts
  [SCSI] gdth: Reorder scsi_host_template intitializers
  [SCSI] gdth: kill gdth_{read,write}[bwl] wrappers
  [SCSI] gdth: Remove 2.4.x support, in-kernel changelog
  [SCSI] gdth: split out pci probing
  [SCSI] gdth: split out eisa probing
  [SCSI] gdth: split out isa probing
  gdth: Make one abuse of scsi_cmnd less obvious
  [SCSI] NCR5380: Use scsi_eh API for REQUEST_SENSE invocation
  [SCSI] usb storage: use scsi_eh API in REQUEST_SENSE execution
  [SCSI] scsi_error: Refactoring scsi_error to facilitate in synchronous REQUEST_SENSE
  ...

1 files changed, 15 insertions, 26 deletions

diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c
index 22b62b3cd14e..82de9e1adb1e 100644
--- a/drivers/fc4/fc.c
+++ b/drivers/fc4/fc.c
@@ -427,15 +427,10 @@ static inline void fcp_scsi_receive(fc_channel *fc, int token, int status, fc_hd
                         memcpy(SCpnt->sense_buffer, ((char *)(rsp+1)), sense_len);
                 }
                 
-                if (fcmd->data) {
-                        if (SCpnt->use_sg)
-                                dma_unmap_sg(fc->dev, (struct scatterlist *)SCpnt->request_buffer,
-                                                SCpnt->use_sg,
-                                                SCpnt->sc_data_direction);
-                        else
-                                dma_unmap_single(fc->dev, fcmd->data, SCpnt->request_bufflen,
-                                                 SCpnt->sc_data_direction);
-                }
+                if (fcmd->data)
+                        dma_unmap_sg(fc->dev, scsi_sglist(SCpnt),
+                                     scsi_sg_count(SCpnt),
+                                     SCpnt->sc_data_direction);
                 break;
         default:
                 host_status=DID_ERROR; /* FIXME */
@@ -793,10 +788,14 @@ static int fcp_scsi_queue_it(fc_channel *fc, struct scsi_cmnd *SCpnt,
                                 fcp_cntl = FCP_CNTL_QTYPE_SIMPLE;
                 } else
                         fcp_cntl = FCP_CNTL_QTYPE_UNTAGGED;
-                if (!SCpnt->request_bufflen && !SCpnt->use_sg) {
+
+                if (!scsi_bufflen(SCpnt)) {
                         cmd->fcp_cntl = fcp_cntl;
                         fcmd->data = (dma_addr_t)NULL;
                 } else {
+                        struct scatterlist *sg;
+                        int nents;
+
                         switch (SCpnt->cmnd[0]) {
                         case WRITE_6:
                         case WRITE_10:
@@ -805,22 +804,12 @@ static int fcp_scsi_queue_it(fc_channel *fc, struct scsi_cmnd *SCpnt,
                         default:
                                 cmd->fcp_cntl = (FCP_CNTL_READ | fcp_cntl); break;
                         }
-                        if (!SCpnt->use_sg) {
-                                cmd->fcp_data_len = SCpnt->request_bufflen;
-                                fcmd->data = dma_map_single (fc->dev, (char *)SCpnt->request_buffer,
-                                                             SCpnt->request_bufflen,
-                                                             SCpnt->sc_data_direction);
-                        } else {
-                                struct scatterlist *sg = (struct scatterlist *)SCpnt->request_buffer;
-                                int nents;
-
-                                FCD(("XXX: Use_sg %d %d\n", SCpnt->use_sg, sg->length))
-                                nents = dma_map_sg (fc->dev, sg, SCpnt->use_sg,
-                                                    SCpnt->sc_data_direction);
-                                if (nents > 1) printk ("%s: SG for nents %d (use_sg %d) not handled yet\n", fc->name, nents, SCpnt->use_sg);
-                                fcmd->data = sg_dma_address(sg);
-                                cmd->fcp_data_len = sg_dma_len(sg);
-                        }
+
+                        sg = scsi_sglist(SCpnt);
+                        nents = dma_map_sg(fc->dev, sg, scsi_sg_count(SCpnt),
+                                           SCpnt->sc_data_direction);
+                        fcmd->data = sg_dma_address(sg);
+                        cmd->fcp_data_len = sg_dma_len(sg);
                 }
                 memcpy (cmd->fcp_cdb, SCpnt->cmnd, SCpnt->cmd_len);
                 memset (cmd->fcp_cdb+SCpnt->cmd_len, 0, sizeof(cmd->fcp_cdb)-SCpnt->cmd_len);