summaryrefslogtreecommitdiffstats
path: root/net/sunrpc/xdr.c
diff options
context:
space:
mode:
authorBenny Halevy <bhalevy@panasas.com>2010-08-29 12:13:15 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-08-29 12:13:15 -0400
commitb1a7a91ada8388936ffff92cf1ad57b3e926f412 (patch)
treeb95a2a8c9b2a65c573980916fda51ec02779165b /net/sunrpc/xdr.c
parent2bfc96a127bc1cc94d26bfaa40159966064f9c8c (diff)
downloadop-kernel-dev-b1a7a91ada8388936ffff92cf1ad57b3e926f412.zip
op-kernel-dev-b1a7a91ada8388936ffff92cf1ad57b3e926f412.tar.gz
sunrpc: don't shorten buflen twice in xdr_shrink_pagelen
On Jan. 14, 2009, 2:50 +0200, andros@netapp.com wrote: > From: Andy Adamson <andros@netapp.com> > > The buflen is reset for all cases at the end of xdr_shrink_pagelen. > The data left in the tail after xdr_read_pages is not processed when the > buflen is incorrectly set. Note that in this case we also lose (len - tail->iov_len) bytes from the buffered data in pages. Reported-by: Andy Adamson <andros@netapp.com> 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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index a1f82a8..91f0de9 100644
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -407,8 +407,7 @@ xdr_shrink_pagelen(struct xdr_buf *buf, size_t len)
if (tail->iov_len > len) {
copy = tail->iov_len - len;
memmove(p, tail->iov_base, copy);
- } else
- buf->buflen -= len;
+ }
/* Copy from the inlined pages into the tail */
copy = len;
if (copy > tail->iov_len)
OpenPOWER on IntegriCloud