diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-30 09:44:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-30 09:44:48 -0700 |
| commit | ae213639983a5406849d62d33257dfc076bc48a7 (patch) | |
| tree | 88f57e618c8352dfbfda974da72259cbbcc8bc15 /fs/nfsd | |
| parent | ba77f7a63f4e4d4ffa5ad8c6665a104822992538 (diff) | |
| parent | 0d32a6bbb8e7bf503855f2990f1ccce0922db87b (diff) | |
| download | linux-stable-ae213639983a5406849d62d33257dfc076bc48a7.tar.gz linux-stable-ae213639983a5406849d62d33257dfc076bc48a7.tar.bz2 linux-stable-ae213639983a5406849d62d33257dfc076bc48a7.zip | |
Merge tag 'nfsd-6.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fix from Chuck Lever:
- Fix NFSv4 READ corner case
* tag 'nfsd-6.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
NFSD: Fix zero NFSv4 READ results when RQ_SPLICE_OK is not set
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 2e40c74d2f72..92c7dde148a4 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -4113,6 +4113,7 @@ static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp, struct file *file, unsigned long maxcount) { struct xdr_stream *xdr = resp->xdr; + unsigned int base = xdr->buf->page_len & ~PAGE_MASK; unsigned int starting_len = xdr->buf->len; __be32 zero = xdr_zero; __be32 nfserr; @@ -4121,8 +4122,7 @@ static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp, return nfserr_resource; nfserr = nfsd_iter_read(resp->rqstp, read->rd_fhp, file, - read->rd_offset, &maxcount, - xdr->buf->page_len & ~PAGE_MASK, + read->rd_offset, &maxcount, base, &read->rd_eof); read->rd_length = maxcount; if (nfserr) |