---

yaml --- r: 217027 b: refs/heads/master c: 42d6d8a h: refs/heads/master i: 217025: 383665b 217023: 72f3656 v: v3
git-mirror · Aug 29, 2010 · 82b04b2 · 82b04b2
1 parent a73fe03
commit 82b04b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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);