On Thu, 2025-08-07 at 12:25 -0400, Mike Snitzer wrote:
> Prepares for nfsd_iter_read() to use DIO alignment stored in nfsd_file.
>
> Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>
> ---
> fs/nfsd/nfs4xdr.c | 8 ++++----
> fs/nfsd/vfs.c | 7 ++++---
> fs/nfsd/vfs.h | 2 +-
> 3 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> index 7d19925f46e45..d519f4156cfad 100644
> --- a/fs/nfsd/nfs4xdr.c
> +++ b/fs/nfsd/nfs4xdr.c
> @@ -4464,7 +4464,7 @@ static __be32 nfsd4_encode_splice_read(
>
> static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp,
> struct nfsd4_read *read,
> - struct file *file, unsigned long maxcount)
> + unsigned long maxcount)
> {
> struct xdr_stream *xdr = resp->xdr;
> unsigned int base = xdr->buf->page_len & ~PAGE_MASK;
> @@ -4475,7 +4475,7 @@ static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp,
> if (xdr_reserve_space_vec(xdr, maxcount) < 0)
> return nfserr_resource;
>
> - nfserr = nfsd_iter_read(resp->rqstp, read->rd_fhp, file,
> + nfserr = nfsd_iter_read(resp->rqstp, read->rd_fhp, read->rd_nf,
> read->rd_offset, &maxcount, base,
> &read->rd_eof);
> read->rd_length = maxcount;
> @@ -4522,7 +4522,7 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr,
> if (file->f_op->splice_read && splice_ok)
> nfserr = nfsd4_encode_splice_read(resp, read, file, maxcount);
> else
> - nfserr = nfsd4_encode_readv(resp, read, file, maxcount);
> + nfserr = nfsd4_encode_readv(resp, read, maxcount);
> if (nfserr) {
> xdr_truncate_encode(xdr, eof_offset);
> return nfserr;
> @@ -5418,7 +5418,7 @@ nfsd4_encode_read_plus_data(struct nfsd4_compoundres *resp,
> if (file->f_op->splice_read && splice_ok)
> nfserr = nfsd4_encode_splice_read(resp, read, file, maxcount);
> else
> - nfserr = nfsd4_encode_readv(resp, read, file, maxcount);
> + nfserr = nfsd4_encode_readv(resp, read, maxcount);
> if (nfserr)
> return nfserr;
>
> diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
> index 0c0f25b2c8e38..79439ad93880a 100644
> --- a/fs/nfsd/vfs.c
> +++ b/fs/nfsd/vfs.c
> @@ -1075,7 +1075,7 @@ __be32 nfsd_splice_read(struct svc_rqst *rqstp, struct svc_fh *fhp,
> * nfsd_iter_read - Perform a VFS read using an iterator
> * @rqstp: RPC transaction context
> * @fhp: file handle of file to be read
> - * @file: opened struct file of file to be read
> + * @nf: opened struct nfsd_file of file to be read
> * @offset: starting byte offset
> * @count: IN: requested number of bytes; OUT: number of bytes read
> * @base: offset in first page of read buffer
> @@ -1088,9 +1088,10 @@ __be32 nfsd_splice_read(struct svc_rqst *rqstp, struct svc_fh *fhp,
> * returned.
> */
> __be32 nfsd_iter_read(struct svc_rqst *rqstp, struct svc_fh *fhp,
> - struct file *file, loff_t offset, unsigned long *count,
> + struct nfsd_file *nf, loff_t offset, unsigned long *count,
> unsigned int base, u32 *eof)
> {
> + struct file *file = nf->nf_file;
> unsigned long v, total;
> struct iov_iter iter;
> struct kiocb kiocb;
> @@ -1312,7 +1313,7 @@ __be32 nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp,
> if (file->f_op->splice_read && nfsd_read_splice_ok(rqstp))
> err = nfsd_splice_read(rqstp, fhp, file, offset, count, eof);
> else
> - err = nfsd_iter_read(rqstp, fhp, file, offset, count, 0, eof);
> + err = nfsd_iter_read(rqstp, fhp, nf, offset, count, 0, eof);
>
> nfsd_file_put(nf);
> trace_nfsd_read_done(rqstp, fhp, offset, *count);
> diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h
> index 0c0292611c6de..fa46f8b5f1320 100644
> --- a/fs/nfsd/vfs.h
> +++ b/fs/nfsd/vfs.h
> @@ -121,7 +121,7 @@ __be32 nfsd_splice_read(struct svc_rqst *rqstp, struct svc_fh *fhp,
> unsigned long *count,
> u32 *eof);
> __be32 nfsd_iter_read(struct svc_rqst *rqstp, struct svc_fh *fhp,
> - struct file *file, loff_t offset,
> + struct nfsd_file *nf, loff_t offset,
> unsigned long *count, unsigned int base,
> u32 *eof);
> bool nfsd_read_splice_ok(struct svc_rqst *rqstp);
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
