diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2016-09-20 14:33:43 -0400 |
|---|---|---|
| committer | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2016-09-22 17:17:47 -0400 |
| commit | a6cebd41b83a271d5b1dcaa5b4676df899f8d4ea (patch) | |
| tree | 693b41266232cacbca36901ebeaee338dfb187a3 /net/sunrpc | |
| parent | ace0e14f4fe5f5944d27d8bd4d3492ad0d2b09e2 (diff) | |
| download | linux-stable-a6cebd41b83a271d5b1dcaa5b4676df899f8d4ea.tar.gz linux-stable-a6cebd41b83a271d5b1dcaa5b4676df899f8d4ea.tar.bz2 linux-stable-a6cebd41b83a271d5b1dcaa5b4676df899f8d4ea.zip | |
SUNRPC: Fix setting of buffer length in xdr_set_next_buffer()
Use xdr->nwords to tell us how much buffer remains.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/xdr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index b8444860edf5..7f1071e103ca 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c @@ -767,7 +767,7 @@ static void xdr_set_next_page(struct xdr_stream *xdr) newbase -= xdr->buf->page_base; if (xdr_set_page_base(xdr, newbase, PAGE_SIZE) < 0) - xdr_set_iov(xdr, xdr->buf->tail, xdr->buf->len); + xdr_set_iov(xdr, xdr->buf->tail, xdr->nwords << 2); } static bool xdr_set_next_buffer(struct xdr_stream *xdr) @@ -776,7 +776,7 @@ static bool xdr_set_next_buffer(struct xdr_stream *xdr) xdr_set_next_page(xdr); else if (xdr->iov == xdr->buf->head) { if (xdr_set_page_base(xdr, 0, PAGE_SIZE) < 0) - xdr_set_iov(xdr, xdr->buf->tail, xdr->buf->len); + xdr_set_iov(xdr, xdr->buf->tail, xdr->nwords << 2); } return xdr->p != xdr->end; } |