From: Benny Halevy <bhalevy@panasas.com>
Date: Sun, 29 Aug 2010 16:13:15 +0000 (-0400)
Subject: sunrpc: don't use the copy variable in nested block
X-Git-Tag: v2.6.37-rc1~120^2~64
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2e29ebb8119e6037133921fac09cc5f9d625b511;p=~emulex%2Finfiniband.git

sunrpc: don't use the copy variable in nested block

to clean up the code "copy" will be set prior to the block
hence it mustn't be used there.

Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 41be21f7f7b..42a7ebf2a32 100644
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -404,8 +404,7 @@ xdr_shrink_pagelen(struct xdr_buf *buf, size_t len)
 	if (tail->iov_len != 0) {
 		if (tail->iov_len > len) {
 			char *p = (char *)tail->iov_base + len;
-			copy = tail->iov_len - len;
-			memmove(p, tail->iov_base, copy);
+			memmove(p, tail->iov_base, tail->iov_len - len);
 		}
 		/* Copy from the inlined pages into the tail */
 		copy = len;