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: (166 commits)
  [SCSI] ibmvscsi: convert to use the data buffer accessors
  [SCSI] dc395x: convert to use the data buffer accessors
  [SCSI] ncr53c8xx: convert to use the data buffer accessors
  [SCSI] sym53c8xx: convert to use the data buffer accessors
  [SCSI] ppa: coding police and printk levels
  [SCSI] aic7xxx_old: remove redundant GFP_ATOMIC from kmalloc
  [SCSI] i2o: remove redundant GFP_ATOMIC from kmalloc from device.c
  [SCSI] remove the dead CYBERSTORMIII_SCSI option
  [SCSI] don't build scsi_dma_{map,unmap} for !HAS_DMA
  [SCSI] Clean up scsi_add_lun a bit
  [SCSI] 53c700: Remove printk, which triggers because of low scsi clock on SNI RMs
  [SCSI] sni_53c710: Cleanup
  [SCSI] qla4xxx: Fix underrun/overrun conditions
  [SCSI] megaraid_mbox: use mutex instead of semaphore
  [SCSI] aacraid: add 51245, 51645 and 52245 adapters to documentation.
  [SCSI] qla2xxx: update version to 8.02.00-k1.
  [SCSI] qla2xxx: add support for NPIV
  [SCSI] stex: use resid for xfer len information
  [SCSI] Add Brownie 1200U3P to blacklist
  [SCSI] scsi.c: convert to use the data buffer accessors
  ...

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index b4b52694497c..d70ddfda93fc 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -76,8 +76,8 @@ static void sas_scsi_task_done(struct sas_task *task)
                         hs = DID_NO_CONNECT;
                         break;
                 case SAS_DATA_UNDERRUN:
-                        sc->resid = ts->residual;
-                        if (sc->request_bufflen - sc->resid < sc->underflow)
+                        scsi_set_resid(sc, ts->residual);
+                        if (scsi_bufflen(sc) - scsi_get_resid(sc) < sc->underflow)
                                 hs = DID_ERROR;
                         break;
                 case SAS_DATA_OVERRUN:
@@ -161,9 +161,9 @@ static struct sas_task *sas_create_task(struct scsi_cmnd *cmd,
         task->ssp_task.task_attr = sas_scsi_get_task_attr(cmd);
         memcpy(task->ssp_task.cdb, cmd->cmnd, 16);
 
-        task->scatter = cmd->request_buffer;
-        task->num_scatter = cmd->use_sg;
-        task->total_xfer_len = cmd->request_bufflen;
+        task->scatter = scsi_sglist(cmd);
+        task->num_scatter = scsi_sg_count(cmd);
+        task->total_xfer_len = scsi_bufflen(cmd);
         task->data_dir = cmd->sc_data_direction;
 
         task->task_done = sas_scsi_task_done;