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>

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);