diff --git a/[refs] b/[refs] index 1196d4f5a099..c9f570193136 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0fe62a35903e11fb41b492bd5b0e8e4c751d5c94 +refs/heads/master: 2e29ebb8119e6037133921fac09cc5f9d625b511 diff --git a/trunk/net/sunrpc/xdr.c b/trunk/net/sunrpc/xdr.c index 41be21f7f7b9..42a7ebf2a322 100644 --- a/trunk/net/sunrpc/xdr.c +++ b/trunk/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;