From: trondmy@kernel.org
To: linux-nfs@vger.kernel.org
Subject: [PATCH 7/8] SUNRPC: Fix open coded xdr_stream_remaining()
Date: Sun, 22 Nov 2020 15:52:28 -0500 [thread overview]
Message-ID: <20201122205229.3826-8-trondmy@kernel.org> (raw)
In-Reply-To: <20201122205229.3826-7-trondmy@kernel.org>
From: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
---
net/sunrpc/xdr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index ddd5cc2281ab..c852d199c789 100644
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -1261,7 +1261,7 @@ uint64_t xdr_align_data(struct xdr_stream *xdr, uint64_t offset, uint32_t length
xdr_realign_pages(xdr);
from = xdr_page_pos(xdr);
- bytes = xdr->nwords << 2;
+ bytes = xdr_stream_remaining(xdr);
if (length < bytes)
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);
from = xdr_page_pos(xdr);
- bytes = xdr->nwords << 2;
+ bytes = xdr_stream_remaining(xdr);
if (offset + length + bytes > buf->page_len) {
unsigned int shift = (offset + length + bytes) - buf->page_len;
--
2.28.0
next prev parent reply other threads:[~2020-11-22 20:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-22 20:52 [PATCH 0/8] Fix various issues in the SUNRPC xdr code trondmy
2020-11-22 20:52 ` [PATCH 1/8] NFSv4: Fix the alignment of page data in the getdeviceinfo reply trondmy
2020-11-22 20:52 ` [PATCH 2/8] SUNRPC: Fix up typo in xdr_init_decode() trondmy
2020-11-22 20:52 ` [PATCH 3/8] SUNRPC: Clean up helpers xdr_set_iov() and xdr_set_page_base() trondmy
2020-11-22 20:52 ` [PATCH 4/8] SUNRPC: Fix up xdr_read_pages() to take arbitrary object lengths trondmy
2020-11-22 20:52 ` [PATCH 5/8] SUNRPC: Don't truncate tail in xdr_inline_pages() trondmy
2020-11-22 20:52 ` [PATCH 6/8] SUNRPC: Fix up xdr_set_page() trondmy
2020-11-22 20:52 ` trondmy [this message]
2020-11-22 20:52 ` [PATCH 8/8] NFSv4: Fix open coded xdr_stream_remaining() trondmy
2020-11-23 1:24 ` [PATCH 5/8] SUNRPC: Don't truncate tail in xdr_inline_pages() Chuck Lever
2020-11-23 4:29 ` Trond Myklebust
2020-11-23 14:52 ` Chuck Lever
2020-11-23 15:37 ` Trond Myklebust
2020-11-23 15:47 ` Chuck Lever
2020-11-23 17:24 ` Anna Schumaker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201122205229.3826-8-trondmy@kernel.org \
--to=trondmy@kernel.org \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.