tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds ae213639 ba77f7a6

+2 -2
+2 -2
fs/nfsd/nfs4xdr.c
··· 4113 4113 struct file *file, unsigned long maxcount) 4114 4114 { 4115 4115 struct xdr_stream *xdr = resp->xdr; 4116 + unsigned int base = xdr->buf->page_len & ~PAGE_MASK; 4116 4117 unsigned int starting_len = xdr->buf->len; 4117 4118 __be32 zero = xdr_zero; 4118 4119 __be32 nfserr; ··· 4122 4121 return nfserr_resource; 4123 4122 4124 4123 nfserr = nfsd_iter_read(resp->rqstp, read->rd_fhp, file, 4125 - read->rd_offset, &maxcount, 4126 - xdr->buf->page_len & ~PAGE_MASK, 4124 + read->rd_offset, &maxcount, base, 4127 4125 &read->rd_eof); 4128 4126 read->rd_length = maxcount; 4129 4127 if (nfserr)