Commit 42d6d8ab authored by Benny Halevy's avatar Benny Halevy Committed by Trond Myklebust

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: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 2e29ebb8
...@@ -402,14 +402,13 @@ xdr_shrink_pagelen(struct xdr_buf *buf, size_t len) ...@@ -402,14 +402,13 @@ xdr_shrink_pagelen(struct xdr_buf *buf, size_t len)
/* Shift the tail first */ /* Shift the tail first */
if (tail->iov_len != 0) { if (tail->iov_len != 0) {
copy = len;
if (tail->iov_len > len) { if (tail->iov_len > len) {
char *p = (char *)tail->iov_base + len; char *p = (char *)tail->iov_base + len;
memmove(p, tail->iov_base, tail->iov_len - len); memmove(p, tail->iov_base, tail->iov_len - len);
} } else
/* Copy from the inlined pages into the tail */
copy = len;
if (copy > tail->iov_len)
copy = tail->iov_len; copy = tail->iov_len;
/* Copy from the inlined pages into the tail */
_copy_from_pages((char *)tail->iov_base, _copy_from_pages((char *)tail->iov_base,
buf->pages, buf->page_base + pglen - len, buf->pages, buf->page_base + pglen - len,
copy); copy);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment