iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SUNRPC: Fix open coded xdr_stream_remaining()

Browse Source 
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Trond Myklebust 2020-11-21 21:39:02 -05:00
parent 0279024f22
commit eee1f54964
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/sunrpc/xdr.c
View File

@ -1261,7 +1261,7 @@ uint64_t xdr_align_data(struct xdr_stream *xdr, uint64_t offset, uint32_t length
xdr_realign_pages(xdr); xdr_realign_pages(xdr);
from = xdr_page_pos(xdr); from = xdr_page_pos(xdr);
bytes = xdr->nwords << 2; bytes = xdr_stream_remaining(xdr);
if (length < bytes) if (length < bytes)
bytes = length; bytes = length;
@ -1298,7 +1298,7 @@ uint64_t xdr_expand_hole(struct xdr_stream *xdr, uint64_t offset, uint64_t lengt
xdr_realign_pages(xdr); xdr_realign_pages(xdr);
from = xdr_page_pos(xdr); from = xdr_page_pos(xdr);
bytes = xdr->nwords << 2; bytes = xdr_stream_remaining(xdr);
if (offset + length + bytes > buf->page_len) { if (offset + length + bytes > buf->page_len) {
unsigned int shift = (offset + length + bytes) - buf->page_len; unsigned int shift = (offset + length + bytes) - buf->page_len;