SG: Change sg_set_page() to take length and offset argument

Most drivers need to set length and offset as well, so may as well fold
those three lines into one.

Add sg_assign_page() for those two locations that only needed to set
the page, where the offset/length is set outside of the function context.

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

5 files changed, 13 insertions, 26 deletions

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 439b97a6a269..0841df01bc19 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -2890,7 +2890,7 @@ static struct ipr_sglist *ipr_alloc_ucode_buffer(int buf_len)
                         return NULL;
                 }
 
-                sg_set_page(&scatterlist[i], page);
+                sg_set_page(&scatterlist[i], page, 0, 0);
         }
 
         return sglist;
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 6ce4109efdf3..097a136398cb 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -79,9 +79,7 @@ static inline void
 iscsi_buf_init_sg(struct iscsi_buf *ibuf, struct scatterlist *sg)
 {
         sg_init_table(&ibuf->sg, 1);
-        sg_set_page(&ibuf->sg, sg_page(sg));
-        ibuf->sg.offset = sg->offset;
-        ibuf->sg.length = sg->length;
+        sg_set_page(&ibuf->sg, sg_page(sg), sg->length, sg->offset);
         /*
          * Fastpath: sg element fits into single page
          */
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 1c5c4b68f20f..4652ad22516b 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -5256,8 +5256,7 @@ static int enlarge_buffer(struct osst_buffer *STbuffer, int need_dma)
 
                 STbuffer->sg[0].offset = 0;
                 if (page != NULL) {
-                    sg_set_page(&STbuffer->sg[0], page);
-                    STbuffer->sg[0].length = b_size;
+                    sg_set_page(&STbuffer->sg[0], page, b_size, 0);
                     STbuffer->b_data = page_address(page);
                     break;
                 }
@@ -5285,8 +5284,7 @@ static int enlarge_buffer(struct osst_buffer *STbuffer, int need_dma)
                         normalize_buffer(STbuffer);
                         return 0;
                 }
-                sg_set_page(&STbuffer->sg[segs], page);
-                STbuffer->sg[segs].length = (OS_FRAME_SIZE - got <= PAGE_SIZE / 2) ? (OS_FRAME_SIZE - got) : b_size;
+                sg_set_page(&STbuffer->sg[segs], page, (OS_FRAME_SIZE - got <= PAGE_SIZE / 2) ? (OS_FRAME_SIZE - got) : b_size, 0);
                 got += STbuffer->sg[segs].length;
                 STbuffer->buffer_size = got;
                 STbuffer->sg_segs = ++segs;
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index cc1971002846..b5fa4f091387 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1717,16 +1717,12 @@ st_map_user_pages(struct scatterlist *sgl, const unsigned int max_pages,
                    goto out_unlock; */
         }
 
-        sg_set_page(sgl, pages[0]);
-        sgl[0].offset = uaddr & ~PAGE_MASK;
+        sg_set_page(sgl, pages[0], 0, uaddr & ~PAGE_MASK);
         if (nr_pages > 1) {
                 sgl[0].length = PAGE_SIZE - sgl[0].offset;
                 count -= sgl[0].length;
-                for (i=1; i < nr_pages ; i++) {
-                        sg_set_page(&sgl[i], pages[i]);
-                        sgl[i].length = count < PAGE_SIZE ? count : PAGE_SIZE;
-                        count -= PAGE_SIZE;
-                }
+                for (i=1; i < nr_pages ; i++)
+                        sg_set_page(&sgl[i], pages[i], count < PAGE_SIZE ? count : PAGE_SIZE, 0);
         }
         else {
                 sgl[0].length = count;
@@ -1854,8 +1850,7 @@ sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size)
                                 scatter_elem_sz_prev = ret_sz;
                         }
                 }
-                sg_set_page(sg, p);
-                sg->length = (ret_sz > num) ? num : ret_sz;
+                sg_set_page(sg, p, (ret_sz > num) ? num : ret_sz, 0);
 
                 SCSI_LOG_TIMEOUT(5, printk("sg_build_indirect: k=%d, num=%d, "
                                  "ret_sz=%d\n", k, num, ret_sz));
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index ce69b9efc102..98dfd6ea209c 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -3797,13 +3797,11 @@ static void buf_to_sg(struct st_buffer *STbp, unsigned int length)
         sg = &(STbp->sg[0]);
         frp = STbp->frp;
         for (i=count=0; count < length; i++) {
-                sg_set_page(&sg[i], frp[i].page);
                 if (length - count > frp[i].length)
-                        sg[i].length = frp[i].length;
+                        sg_set_page(&sg[i], frp[i].page, frp[i].length, 0);
                 else
-                        sg[i].length = length - count;
+                        sg_set_page(&sg[i], frp[i].page, length - count, 0);
                 count += sg[i].length;
-                sg[i].offset = 0;
         }
         STbp->sg_segs = i;
         STbp->frp_sg_current = length;
@@ -4446,15 +4444,13 @@ static int sgl_map_user_pages(struct scatterlist *sgl, const unsigned int max_pa
         }
 
         /* Populate the scatter/gather list */
-        sg_set_page(&sgl[0], pages[0]);
-        sgl[0].offset = uaddr & ~PAGE_MASK;
+        sg_set_page(&sgl[0], pages[0], 0, uaddr & ~PAGE_MASK);
         if (nr_pages > 1) {
                 sgl[0].length = PAGE_SIZE - sgl[0].offset;
                 count -= sgl[0].length;
                 for (i=1; i < nr_pages ; i++) {
-                        sg_set_page(&sgl[i], pages[i]);;
-                        sgl[i].offset = 0;
-                        sgl[i].length = count < PAGE_SIZE ? count : PAGE_SIZE;
+                        sg_set_page(&sgl[i], pages[i],
+                                    count < PAGE_SIZE ? count : PAGE_SIZE, 0);;
                         count -= PAGE_SIZE;
                 }
         }