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>

2 files changed, 7 insertions, 11 deletions

diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c
index 32be431affcf..24711be4b2dc 100644
--- a/net/sunrpc/auth_gss/gss_krb5_crypto.c
+++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c
@@ -199,7 +199,7 @@ encryptor(struct scatterlist *sg, void *data)
         } else {
                 in_page = sg_page(sg);
         }
-        sg_set_page(&desc->infrags[desc->fragno], in_page);
+        sg_assign_page(&desc->infrags[desc->fragno], in_page);
         desc->fragno++;
         desc->fraglen += sg->length;
         desc->pos += sg->length;
@@ -215,11 +215,10 @@ encryptor(struct scatterlist *sg, void *data)
         if (ret)
                 return ret;
         if (fraglen) {
-                sg_set_page(&desc->outfrags[0], sg_page(sg));
-                desc->outfrags[0].offset = sg->offset + sg->length - fraglen;
-                desc->outfrags[0].length = fraglen;
+                sg_set_page(&desc->outfrags[0], sg_page(sg), fraglen,
+                                sg->offset + sg->length - fraglen);
                 desc->infrags[0] = desc->outfrags[0];
-                sg_set_page(&desc->infrags[0], in_page);
+                sg_assign_page(&desc->infrags[0], in_page);
                 desc->fragno = 1;
                 desc->fraglen = fraglen;
         } else {
@@ -287,9 +286,8 @@ decryptor(struct scatterlist *sg, void *data)
         if (ret)
                 return ret;
         if (fraglen) {
-                sg_set_page(&desc->frags[0], sg_page(sg));
-                desc->frags[0].offset = sg->offset + sg->length - fraglen;
-                desc->frags[0].length = fraglen;
+                sg_set_page(&desc->frags[0], sg_page(sg), fraglen,
+                                sg->offset + sg->length - fraglen);
                 desc->fragno = 1;
                 desc->fraglen = fraglen;
         } else {
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 3d1f7cdf9dd0..f38dac30481b 100644
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -1059,9 +1059,7 @@ xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len,
                 do {
                         if (thislen > page_len)
                                 thislen = page_len;
-                        sg_set_page(sg, buf->pages[i]);
-                        sg->offset = page_offset;
-                        sg->length = thislen;
+                        sg_set_page(sg, buf->pages[i], thislen, page_offset);
                         ret = actor(sg, data);
                         if (ret)
                                 goto out;