Skip to content

Commit

Permalink
sunrpc: simplify xdr_shrink_pagelen use of "copy"
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Benny Halevy authored and Trond Myklebust committed Aug 29, 2010
1 parent 2e29ebb commit 42d6d8a
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions net/sunrpc/xdr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 42d6d8a

Please sign in to comment.