Commit f7d61ee4 authored by Anna Schumaker's avatar Anna Schumaker
Browse files

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: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 247db735

net/sunrpc/xdr.c

+9 −4
Original line number Diff line number Diff line
@@ -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;

}