Commit ae213639 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ba77f7a6 0d32a6bb

fs/nfsd/nfs4xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -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)