From 82b04b27115df8b3ca6825b8dc2097f7accc3321 Mon Sep 17 00:00:00 2001
From: Benny Halevy <bhalevy@panasas.com>
Date: Sun, 29 Aug 2010 12:13:15 -0400
Subject: [PATCH] --- yaml --- r: 217027 b: refs/heads/master c:
 42d6d8ab51ca04afcb8a64759076da624cdb71e8 h: refs/heads/master i:   217025:
 383665b321f47a163695c785306d1d78b66c076b   217023:
 72f3656263b8b9fa1fec284567768014b8bd9aad v: v3

---
 [refs]                 | 2 +-
 trunk/net/sunrpc/xdr.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c9f570193136..340963cb9754 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e29ebb8119e6037133921fac09cc5f9d625b511
+refs/heads/master: 42d6d8ab51ca04afcb8a64759076da624cdb71e8
diff --git a/trunk/net/sunrpc/xdr.c b/trunk/net/sunrpc/xdr.c
index 42a7ebf2a322..3317db3cb102 100644
--- a/trunk/net/sunrpc/xdr.c
+++ b/trunk/net/sunrpc/xdr.c
@@ -402,14 +402,13 @@ xdr_shrink_pagelen(struct xdr_buf *buf, size_t len)
 
 	/* Shift the tail first */
 	if (tail->iov_len != 0) {
+		copy = len;
 		if (tail->iov_len > len) {
 			char *p = (char *)tail->iov_base + len;
 			memmove(p, tail->iov_base, tail->iov_len - len);
-		}
-		/* Copy from the inlined pages into the tail */
-		copy = len;
-		if (copy > tail->iov_len)
+		} else
 			copy = tail->iov_len;
+		/* Copy from the inlined pages into the tail */
 		_copy_from_pages((char *)tail->iov_base,
 				buf->pages, buf->page_base + pglen - len,
 				copy);