summaryrefslogtreecommitdiffstats
path: root/net/sunrpc/xdr.c
diff options
context:
space:
mode:
authorBenny Halevy2010-08-29 18:13:15 +0200
committerTrond Myklebust2010-08-29 18:13:15 +0200
commit2e29ebb8119e6037133921fac09cc5f9d625b511 (patch)
tree87797fdf21852b6db83a976e14a52500f06ba17f /net/sunrpc/xdr.c
parentsunrpc: clean up xdr_shrink_pagelen use of temporary pointer (diff)
downloadkernel-qcow2-linux-2e29ebb8119e6037133921fac09cc5f9d625b511.tar.gz
kernel-qcow2-linux-2e29ebb8119e6037133921fac09cc5f9d625b511.tar.xz
kernel-qcow2-linux-2e29ebb8119e6037133921fac09cc5f9d625b511.zip
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>
Diffstat (limited to 'net/sunrpc/xdr.c')
-rw-r--r--net/sunrpc/xdr.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 41be21f7f7b9..42a7ebf2a322 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;