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>
This commit is contained in:
Родитель
ace0e14f4f
Коммит
a6cebd41b8
|
@ -767,7 +767,7 @@ static void xdr_set_next_page(struct xdr_stream *xdr)
|
||||||
newbase -= xdr->buf->page_base;
|
newbase -= xdr->buf->page_base;
|
||||||
|
|
||||||
if (xdr_set_page_base(xdr, newbase, PAGE_SIZE) < 0)
|
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)
|
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);
|
xdr_set_next_page(xdr);
|
||||||
else if (xdr->iov == xdr->buf->head) {
|
else if (xdr->iov == xdr->buf->head) {
|
||||||
if (xdr_set_page_base(xdr, 0, PAGE_SIZE) < 0)
|
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;
|
return xdr->p != xdr->end;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче