From cf2541c7d5b78500cb14ca56b8978f3930e216b4 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Wed, 1 Aug 2012 14:32:13 -0400
Subject: [PATCH] --- yaml --- r: 333115 b: refs/heads/master c:
 8a9a8b8332b92b13316cf49685b5dc5257cfe115 h: refs/heads/master i:   333113:
 44dc90e58d2819e0eda500c069a77b3b1ceffb92   333111:
 231f0433ac6aee3b28c3dde1d6318a377fc0f959 v: v3

---
 [refs]                 | 2 +-
 trunk/net/sunrpc/xdr.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e87043ba5970..edeb3c474bcf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62d98c935456ee121b03d6a68aa3091a04085b7e
+refs/heads/master: 8a9a8b8332b92b13316cf49685b5dc5257cfe115
diff --git a/trunk/net/sunrpc/xdr.c b/trunk/net/sunrpc/xdr.c
index 0afba1b4b656..fbbd1c475b43 100644
--- a/trunk/net/sunrpc/xdr.c
+++ b/trunk/net/sunrpc/xdr.c
@@ -742,6 +742,8 @@ static unsigned int xdr_align_pages(struct xdr_stream *xdr, unsigned int len)
 	/* Truncate page data and move it into the tail */
 	if (buf->page_len > len)
 		xdr_shrink_pagelen(buf, buf->page_len - len);
+	else
+		len = buf->page_len;
 	xdr->nwords = XDR_QUADLEN(buf->len - cur);
 	return len;
 }