From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Thu, 21 Jun 2012 18:53:10 +0000 (-0400)
Subject: SUNRPC: Clean up xdr_enter_page
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f8bb7f08549a1ced9ceb69a9bd5e163122044ab2;p=linux-beck.git

SUNRPC: Clean up xdr_enter_page

Use the xdr_align_pages() helper

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 03603f332fe6..2e3694eccd82 100644
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -826,13 +826,13 @@ EXPORT_SYMBOL_GPL(xdr_read_pages);
  */
 void xdr_enter_page(struct xdr_stream *xdr, unsigned int len)
 {
-	len = xdr_read_pages(xdr, len);
+	len = xdr_align_pages(xdr, len);
 	/*
 	 * Position current pointer at beginning of tail, and
 	 * set remaining message length.
 	 */
-	xdr_set_page_base(xdr, 0, len);
-	xdr->nwords += XDR_QUADLEN(xdr->buf->page_len);
+	if (len != 0)
+		xdr_set_page_base(xdr, 0, len);
 }
 EXPORT_SYMBOL_GPL(xdr_enter_page);