summaryrefslogtreecommitdiff
path: root/net/sunrpc/xdr.c
diff options
context:
space:
mode:
authorBenny Halevy <bhalevy@panasas.com>2010-08-29 20:13:15 +0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-08-29 20:13:15 +0400
commit42d6d8ab51ca04afcb8a64759076da624cdb71e8 (patch)
treec8e23374b11578de5cddd9dde7d158bc5fe4dcc6 /net/sunrpc/xdr.c
parent2e29ebb8119e6037133921fac09cc5f9d625b511 (diff)
downloadlinux-42d6d8ab51ca04afcb8a64759076da624cdb71e8.tar.xz
sunrpc: simplify xdr_shrink_pagelen use of "copy"
The "copy" variable value can be computed using the existing logic rather than repeating it. 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.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 42a7ebf2a322..3317db3cb102 100644
--- a/net/sunrpc/xdr.c
+++ b/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);