SUNRPC: Split out a function for setting current page

I'm going to need this bit of code in a few places for READ_PLUS
decoding, so let's make it a helper function.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index be11d672b5b972567eac1413cffd00aa86180490..fa7517c1d125e44bdaae264bee836603cd2d4fd0 100644 (file)
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -825,6 +825,13 @@ static int xdr_set_page_base(struct xdr_stream *xdr,
        return 0;
 }
 
+static void xdr_set_page(struct xdr_stream *xdr, unsigned int base,
+                        unsigned int len)
+{
+       if (xdr_set_page_base(xdr, base, len) < 0)
+               xdr_set_iov(xdr, xdr->buf->tail, xdr->nwords << 2);
+}
+
 static void xdr_set_next_page(struct xdr_stream *xdr)
 {
        unsigned int newbase;
@@ -832,8 +839,7 @@ static void xdr_set_next_page(struct xdr_stream *xdr)
        newbase = (1 + xdr->page_ptr - xdr->buf->pages) << PAGE_SHIFT;
        newbase -= xdr->buf->page_base;
 
-       if (xdr_set_page_base(xdr, newbase, PAGE_SIZE) < 0)
-               xdr_set_iov(xdr, xdr->buf->tail, xdr->nwords << 2);
+       xdr_set_page(xdr, newbase, PAGE_SIZE);
 }
 
 static bool xdr_set_next_buffer(struct xdr_stream *xdr)
@@ -841,8 +847,7 @@ static bool xdr_set_next_buffer(struct xdr_stream *xdr)
        if (xdr->page_ptr != NULL)
                xdr_set_next_page(xdr);
        else if (xdr->iov == xdr->buf->head) {
-               if (xdr_set_page_base(xdr, 0, PAGE_SIZE) < 0)
-                       xdr_set_iov(xdr, xdr->buf->tail, xdr->nwords << 2);
+               xdr_set_page(xdr, 0, PAGE_SIZE);
        }
        return xdr->p != xdr->end;
 }