USB storage: sg chaining support

[PATCH] USB storage: sg chaining support

Modify usb_stor_access_xfer_buf() to take a pointer to an sg
entry pointer, so we can keep track of that instead of passing
around an integer index (which we can't use when dealing with
multiple scatterlist arrays).

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/usb/storage/jumpshot.c b/drivers/usb/storage/jumpshot.c
index 003fcf545888..61097cbb1585 100644
--- a/drivers/usb/storage/jumpshot.c
+++ b/drivers/usb/storage/jumpshot.c
@@ -119,7 +119,8 @@ static int jumpshot_read_data(struct us_data *us,
         unsigned char  thistime;
         unsigned int totallen, alloclen;
         int len, result;
-        unsigned int sg_idx = 0, sg_offset = 0;
+        unsigned int sg_offset = 0;
+        struct scatterlist *sg = NULL;
 
         // we're working in LBA mode.  according to the ATA spec, 
         // we can support up to 28-bit addressing.  I don't know if Jumpshot
@@ -170,7 +171,7 @@ static int jumpshot_read_data(struct us_data *us,
 
                 // Store the data in the transfer buffer
                 usb_stor_access_xfer_buf(buffer, len, us->srb,
-                                 &sg_idx, &sg_offset, TO_XFER_BUF);
+                                 &sg, &sg_offset, TO_XFER_BUF);
 
                 sector += thistime;
                 totallen -= len;
@@ -195,7 +196,8 @@ static int jumpshot_write_data(struct us_data *us,
         unsigned char  thistime;
         unsigned int totallen, alloclen;
         int len, result, waitcount;
-        unsigned int sg_idx = 0, sg_offset = 0;
+        unsigned int sg_offset = 0;
+        struct scatterlist *sg = NULL;
 
         // we're working in LBA mode.  according to the ATA spec, 
         // we can support up to 28-bit addressing.  I don't know if Jumpshot
@@ -225,7 +227,7 @@ static int jumpshot_write_data(struct us_data *us,
 
                 // Get the data from the transfer buffer
                 usb_stor_access_xfer_buf(buffer, len, us->srb,
-                                &sg_idx, &sg_offset, FROM_XFER_BUF);
+                                &sg, &sg_offset, FROM_XFER_BUF);
 
                 command[0] = 0;
                 command[1] = thistime;