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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (200 commits)
  [SCSI] usbstorage: use last_sector_bug flag universally
  [SCSI] libsas: abstract STP task status into a function
  [SCSI] ultrastor: clean up inline asm warnings
  [SCSI] aic7xxx: fix firmware build
  [SCSI] aacraid: fib context lock for management ioctls
  [SCSI] ch: remove forward declarations
  [SCSI] ch: fix device minor number management bug
  [SCSI] ch: handle class_device_create failure properly
  [SCSI] NCR5380: fix section mismatch
  [SCSI] sg: fix /proc/scsi/sg/devices when no SCSI devices
  [SCSI] IB/iSER: add logical unit reset support
  [SCSI] don't use __GFP_DMA for sense buffers if not required
  [SCSI] use dynamically allocated sense buffer
  [SCSI] scsi.h: add macro for enclosure bit of inquiry data
  [SCSI] sd: add fix for devices with last sector access problems
  [SCSI] fix pcmcia compile problem
  [SCSI] aacraid: add Voodoo Lite class of cards.
  [SCSI] aacraid: add new driver features flags
  [SCSI] qla2xxx: Update version number to 8.02.00-k7.
  [SCSI] qla2xxx: Issue correct MBC_INITIALIZE_FIRMWARE command.
  ...

1 files changed, 12 insertions, 11 deletions

diff --git a/drivers/scsi/libsrp.c b/drivers/scsi/libsrp.c
index 2ad0a27dbaab..5cff0204227d 100644
--- a/drivers/scsi/libsrp.c
+++ b/drivers/scsi/libsrp.c
@@ -192,18 +192,18 @@ static int srp_direct_data(struct scsi_cmnd *sc, struct srp_direct_buf *md,
 
         if (dma_map) {
                 iue = (struct iu_entry *) sc->SCp.ptr;
-                sg = sc->request_buffer;
+                sg = scsi_sglist(sc);
 
-                dprintk("%p %u %u %d\n", iue, sc->request_bufflen,
-                        md->len, sc->use_sg);
+                dprintk("%p %u %u %d\n", iue, scsi_bufflen(sc),
+                        md->len, scsi_sg_count(sc));
 
-                nsg = dma_map_sg(iue->target->dev, sg, sc->use_sg,
+                nsg = dma_map_sg(iue->target->dev, sg, scsi_sg_count(sc),
                                  DMA_BIDIRECTIONAL);
                 if (!nsg) {
-                        printk("fail to map %p %d\n", iue, sc->use_sg);
+                        printk("fail to map %p %d\n", iue, scsi_sg_count(sc));
                         return 0;
                 }
-                len = min(sc->request_bufflen, md->len);
+                len = min(scsi_bufflen(sc), md->len);
         } else
                 len = md->len;
 
@@ -229,10 +229,10 @@ static int srp_indirect_data(struct scsi_cmnd *sc, struct srp_cmd *cmd,
 
         if (dma_map || ext_desc) {
                 iue = (struct iu_entry *) sc->SCp.ptr;
-                sg = sc->request_buffer;
+                sg = scsi_sglist(sc);
 
                 dprintk("%p %u %u %d %d\n",
-                        iue, sc->request_bufflen, id->len,
+                        iue, scsi_bufflen(sc), id->len,
                         cmd->data_in_desc_cnt, cmd->data_out_desc_cnt);
         }
 
@@ -268,13 +268,14 @@ static int srp_indirect_data(struct scsi_cmnd *sc, struct srp_cmd *cmd,
 
 rdma:
         if (dma_map) {
-                nsg = dma_map_sg(iue->target->dev, sg, sc->use_sg, DMA_BIDIRECTIONAL);
+                nsg = dma_map_sg(iue->target->dev, sg, scsi_sg_count(sc),
+                                 DMA_BIDIRECTIONAL);
                 if (!nsg) {
-                        eprintk("fail to map %p %d\n", iue, sc->use_sg);
+                        eprintk("fail to map %p %d\n", iue, scsi_sg_count(sc));
                         err = -EIO;
                         goto free_mem;
                 }
-                len = min(sc->request_bufflen, id->len);
+                len = min(scsi_bufflen(sc), id->len);
         } else
                 len = id->len;