On Fri, 2024-06-07 at 10:26 -0400, Mike Snitzer wrote:
> From: Weston Andros Adamson <dros@xxxxxxxxxxxxxxx>
>
> The nfs_client is needed for localio support.
>
> Signed-off-by: Weston Andros Adamson <dros@xxxxxxxxxxxxxxx>
> Signed-off-by: Lance Shelton <lance.shelton@xxxxxxxxxxxxxxx>
> Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
> Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>
> ---
> fs/nfs/filelayout/filelayout.c | 4 ++--
> fs/nfs/flexfilelayout/flexfilelayout.c | 6 ++++--
> fs/nfs/internal.h | 5 +++--
> fs/nfs/pagelist.c | 10 ++++++----
> 4 files changed, 15 insertions(+), 10 deletions(-)
>
> diff --git a/fs/nfs/filelayout/filelayout.c
> b/fs/nfs/filelayout/filelayout.c
> index 29d84dc66ca3..43e16e9e0176 100644
> --- a/fs/nfs/filelayout/filelayout.c
> +++ b/fs/nfs/filelayout/filelayout.c
> @@ -486,7 +486,7 @@ filelayout_read_pagelist(struct nfs_pgio_header
> *hdr)
> hdr->mds_offset = offset;
>
> /* Perform an asynchronous read to ds */
> - nfs_initiate_pgio(ds_clnt, hdr, hdr->cred,
> + nfs_initiate_pgio(ds->ds_clp, ds_clnt, hdr, hdr->cred,
> NFS_PROTO(hdr->inode),
> &filelayout_read_call_ops,
> 0, RPC_TASK_SOFTCONN);
> return PNFS_ATTEMPTED;
> @@ -528,7 +528,7 @@ filelayout_write_pagelist(struct nfs_pgio_header
> *hdr, int sync)
> hdr->args.offset = filelayout_get_dserver_offset(lseg,
> offset);
>
> /* Perform an asynchronous write */
> - nfs_initiate_pgio(ds_clnt, hdr, hdr->cred,
> + nfs_initiate_pgio(ds->ds_clp, ds_clnt, hdr, hdr->cred,
> NFS_PROTO(hdr->inode),
> &filelayout_write_call_ops,
> sync, RPC_TASK_SOFTCONN);
> return PNFS_ATTEMPTED;
> diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c
> b/fs/nfs/flexfilelayout/flexfilelayout.c
> index 24188af56d5b..327f1a5c9fbe 100644
> --- a/fs/nfs/flexfilelayout/flexfilelayout.c
> +++ b/fs/nfs/flexfilelayout/flexfilelayout.c
> @@ -1803,7 +1803,8 @@ ff_layout_read_pagelist(struct nfs_pgio_header
> *hdr)
> hdr->mds_offset = offset;
>
> /* Perform an asynchronous read to ds */
> - nfs_initiate_pgio(ds_clnt, hdr, ds_cred, ds->ds_clp-
> >rpc_ops,
> + nfs_initiate_pgio(ds->ds_clp, ds_clnt, hdr, ds_cred,
> + ds->ds_clp->rpc_ops,
> vers == 3 ? &ff_layout_read_call_ops_v3 :
> &ff_layout_read_call_ops_v4,
> 0, RPC_TASK_SOFTCONN);
> @@ -1871,7 +1872,8 @@ ff_layout_write_pagelist(struct nfs_pgio_header
> *hdr, int sync)
> hdr->args.offset = offset;
>
> /* Perform an asynchronous write */
> - nfs_initiate_pgio(ds_clnt, hdr, ds_cred, ds->ds_clp-
> >rpc_ops,
> + nfs_initiate_pgio(ds->ds_clp, ds_clnt, hdr, ds_cred,
> + ds->ds_clp->rpc_ops,
> vers == 3 ? &ff_layout_write_call_ops_v3 :
> &ff_layout_write_call_ops_v4,
> sync, RPC_TASK_SOFTCONN);
> diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
> index 9f0f4534744b..a9c0c29f7804 100644
> --- a/fs/nfs/internal.h
> +++ b/fs/nfs/internal.h
> @@ -306,8 +306,9 @@ extern const struct nfs_pageio_ops
> nfs_pgio_rw_ops;
> struct nfs_pgio_header *nfs_pgio_header_alloc(const struct
> nfs_rw_ops *);
> void nfs_pgio_header_free(struct nfs_pgio_header *);
> int nfs_generic_pgio(struct nfs_pageio_descriptor *, struct
> nfs_pgio_header *);
> -int nfs_initiate_pgio(struct rpc_clnt *clnt, struct nfs_pgio_header
> *hdr,
> - const struct cred *cred, const struct
> nfs_rpc_ops *rpc_ops,
> +int nfs_initiate_pgio(struct nfs_client *clp, struct rpc_clnt
> *rpc_clnt,
> + struct nfs_pgio_header *hdr, const struct cred
> *cred,
> + const struct nfs_rpc_ops *rpc_ops,
> const struct rpc_call_ops *call_ops, int how,
> int flags);
> void nfs_free_request(struct nfs_page *req);
> struct nfs_pgio_mirror *
> diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
> index 6efb5068c116..d9b795c538cd 100644
> --- a/fs/nfs/pagelist.c
> +++ b/fs/nfs/pagelist.c
> @@ -844,8 +844,9 @@ static void nfs_pgio_prepare(struct rpc_task
> *task, void *calldata)
> rpc_exit(task, err);
> }
>
> -int nfs_initiate_pgio(struct rpc_clnt *clnt, struct nfs_pgio_header
> *hdr,
> - const struct cred *cred, const struct
> nfs_rpc_ops *rpc_ops,
> +int nfs_initiate_pgio(struct nfs_client *clp, struct rpc_clnt
> *rpc_clnt,
> + struct nfs_pgio_header *hdr, const struct cred
> *cred,
> + const struct nfs_rpc_ops *rpc_ops,
> const struct rpc_call_ops *call_ops, int how,
> int flags)
> {
> struct rpc_task *task;
> @@ -855,7 +856,7 @@ int nfs_initiate_pgio(struct rpc_clnt *clnt,
> struct nfs_pgio_header *hdr,
> .rpc_cred = cred,
> };
> struct rpc_task_setup task_setup_data = {
> - .rpc_client = clnt,
> + .rpc_client = rpc_clnt,
> .task = &hdr->task,
> .rpc_message = &msg,
> .callback_ops = call_ops,
> @@ -1070,7 +1071,8 @@ static int nfs_generic_pg_pgios(struct
> nfs_pageio_descriptor *desc)
> if (ret == 0) {
> if (NFS_SERVER(hdr->inode)->nfs_client-
> >cl_minorversion)
> task_flags = RPC_TASK_MOVEABLE;
> - ret = nfs_initiate_pgio(NFS_CLIENT(hdr->inode),
> + ret = nfs_initiate_pgio(NFS_SERVER(hdr->inode)-
> >nfs_client,
> + NFS_CLIENT(hdr->inode),
> hdr,
> hdr->cred,
> NFS_PROTO(hdr->inode),
My first inclination was that this is redundant since the nfs_client
has a pointer to the rpc_client in it, but in the pNFS situation I
suppose they aren't necessary the same thing, so I guess you have to do
it this way.
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
