Re: [PATCH 1/3] sunrpc: simplify xdr_init_encode_pages

Jeff Layton
2025-05-13T12:16:00Z

On Tue, 2025-05-13 at 10:57 +0200, Christoph Hellwig wrote:
> The rqst argument to xdr_init_encode_pages is set to NULL by all callers,
> and pages is always set to buf->pages. Remove the two arguments and
> hardcode the assignments.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> fs/nfsd/nfs3proc.c | 2 +-
> fs/nfsd/nfsproc.c | 2 +-
> include/linux/sunrpc/xdr.h | 3 +--
> net/sunrpc/xdr.c | 11 ++++-------
> 4 files changed, 7 insertions(+), 11 deletions(-)
>
> diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c
> index 8902fae8c62d..6c94042b03fa 100644
> --- a/fs/nfsd/nfs3proc.c
> +++ b/fs/nfsd/nfs3proc.c
> @@ -562,7 +562,7 @@ static void nfsd3_init_dirlist_pages(struct svc_rqst *rqstp,
> buf->pages = rqstp->rq_next_page;
> rqstp->rq_next_page += (buf->buflen + PAGE_SIZE - 1) >> PAGE_SHIFT;
>
> - xdr_init_encode_pages(xdr, buf, buf->pages, NULL);
> + xdr_init_encode_pages(xdr, buf);
> }
>
> /*
> diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
> index 7c573d792252..f1c2c096804b 100644
> --- a/fs/nfsd/nfsproc.c
> +++ b/fs/nfsd/nfsproc.c
> @@ -577,7 +577,7 @@ static void nfsd_init_dirlist_pages(struct svc_rqst *rqstp,
> buf->pages = rqstp->rq_next_page;
> rqstp->rq_next_page++;
>
> - xdr_init_encode_pages(xdr, buf, buf->pages, NULL);
> + xdr_init_encode_pages(xdr, buf);
> }
>
> /*
> diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
> index a2ab813a9800..29d3a7659727 100644
> --- a/include/linux/sunrpc/xdr.h
> +++ b/include/linux/sunrpc/xdr.h
> @@ -242,8 +242,7 @@ typedef int (*kxdrdproc_t)(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
>
> extern void xdr_init_encode(struct xdr_stream *xdr, struct xdr_buf *buf,
> __be32 *p, struct rpc_rqst *rqst);
> -extern void xdr_init_encode_pages(struct xdr_stream *xdr, struct xdr_buf *buf,
> - struct page **pages, struct rpc_rqst *rqst);
> +void xdr_init_encode_pages(struct xdr_stream *xdr, struct xdr_buf *buf);
> extern __be32 *xdr_reserve_space(struct xdr_stream *xdr, size_t nbytes);
> extern int xdr_reserve_space_vec(struct xdr_stream *xdr, size_t nbytes);
> extern void __xdr_commit_encode(struct xdr_stream *xdr);
> diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
> index 4e003cb516fe..1ab973d3e324 100644
> --- a/net/sunrpc/xdr.c
> +++ b/net/sunrpc/xdr.c
> @@ -992,21 +992,18 @@ EXPORT_SYMBOL_GPL(xdr_init_encode);
> * xdr_init_encode_pages - Initialize an xdr_stream for encoding into pages
> * @xdr: pointer to xdr_stream struct
> * @buf: pointer to XDR buffer into which to encode data
> - * @pages: list of pages to decode into
> - * @rqst: pointer to controlling rpc_rqst, for debugging
> *
> */
> -void xdr_init_encode_pages(struct xdr_stream *xdr, struct xdr_buf *buf,
> - struct page **pages, struct rpc_rqst *rqst)
> +void xdr_init_encode_pages(struct xdr_stream *xdr, struct xdr_buf *buf)
> {
> xdr_reset_scratch_buffer(xdr);
>
> xdr->buf = buf;
> - xdr->page_ptr = pages;
> + xdr->page_ptr = buf->pages;
> xdr->iov = NULL;
> - xdr->p = page_address(*pages);
> + xdr->p = page_address(*xdr->page_ptr);
> xdr->end = (void *)xdr->p + min_t(u32, buf->buflen, PAGE_SIZE);
> - xdr->rqst = rqst;
> + xdr->rqst = NULL;
> }
> EXPORT_SYMBOL_GPL(xdr_init_encode_pages);
>

Reviewed-by: Jeff Layton <jlayton@kernel.org>