On Sat, 09 Nov 2024, Mike Snitzer wrote:
> Rename nfs_uuid_invalidate_one_client to nfs_localio_disable_client.
> Rename nfs_uuid_invalidate_clients to nfs_localio_invalidate_clients.
I agree that is an improvement.
Reviewed-by: NeilBrown <neilb@xxxxxxx>
Thanks,
NeilBrown
>
> Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>
> ---
> fs/nfs/localio.c | 2 +-
> fs/nfs_common/nfslocalio.c | 8 ++++----
> fs/nfsd/nfsctl.c | 4 ++--
> include/linux/nfslocalio.h | 5 +++--
> 4 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/fs/nfs/localio.c b/fs/nfs/localio.c
> index de0dcd76d84d..cab2a8819259 100644
> --- a/fs/nfs/localio.c
> +++ b/fs/nfs/localio.c
> @@ -139,7 +139,7 @@ void nfs_local_disable(struct nfs_client *clp)
> spin_lock(&clp->cl_localio_lock);
> if (test_and_clear_bit(NFS_CS_LOCAL_IO, &clp->cl_flags)) {
> trace_nfs_local_disable(clp);
> - nfs_uuid_invalidate_one_client(&clp->cl_uuid);
> + nfs_localio_disable_client(&clp->cl_uuid);
> }
> spin_unlock(&clp->cl_localio_lock);
> }
> diff --git a/fs/nfs_common/nfslocalio.c b/fs/nfs_common/nfslocalio.c
> index a74ec08f6c96..904439e4bb85 100644
> --- a/fs/nfs_common/nfslocalio.c
> +++ b/fs/nfs_common/nfslocalio.c
> @@ -107,7 +107,7 @@ static void nfs_uuid_put_locked(nfs_uuid_t *nfs_uuid)
> list_del_init(&nfs_uuid->list);
> }
>
> -void nfs_uuid_invalidate_clients(struct list_head *list)
> +void nfs_localio_invalidate_clients(struct list_head *list)
> {
> nfs_uuid_t *nfs_uuid, *tmp;
>
> @@ -116,9 +116,9 @@ void nfs_uuid_invalidate_clients(struct list_head *list)
> nfs_uuid_put_locked(nfs_uuid);
> spin_unlock(&nfs_uuid_lock);
> }
> -EXPORT_SYMBOL_GPL(nfs_uuid_invalidate_clients);
> +EXPORT_SYMBOL_GPL(nfs_localio_invalidate_clients);
>
> -void nfs_uuid_invalidate_one_client(nfs_uuid_t *nfs_uuid)
> +void nfs_localio_disable_client(nfs_uuid_t *nfs_uuid)
> {
> if (nfs_uuid->net) {
> spin_lock(&nfs_uuid_lock);
> @@ -126,7 +126,7 @@ void nfs_uuid_invalidate_one_client(nfs_uuid_t *nfs_uuid)
> spin_unlock(&nfs_uuid_lock);
> }
> }
> -EXPORT_SYMBOL_GPL(nfs_uuid_invalidate_one_client);
> +EXPORT_SYMBOL_GPL(nfs_localio_disable_client);
>
> struct nfsd_file *nfs_open_local_fh(nfs_uuid_t *uuid,
> struct rpc_clnt *rpc_clnt, const struct cred *cred,
> diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
> index 3adbc05ebaac..727904d8a4d0 100644
> --- a/fs/nfsd/nfsctl.c
> +++ b/fs/nfsd/nfsctl.c
> @@ -2276,14 +2276,14 @@ static __net_init int nfsd_net_init(struct net *net)
> * nfsd_net_pre_exit - Disconnect localio clients from net namespace
> * @net: a network namespace that is about to be destroyed
> *
> - * This invalidated ->net pointers held by localio clients
> + * This invalidates ->net pointers held by localio clients
> * while they can still safely access nn->counter.
> */
> static __net_exit void nfsd_net_pre_exit(struct net *net)
> {
> struct nfsd_net *nn = net_generic(net, nfsd_net_id);
>
> - nfs_uuid_invalidate_clients(&nn->local_clients);
> + nfs_localio_invalidate_clients(&nn->local_clients);
> }
> #endif
>
> diff --git a/include/linux/nfslocalio.h b/include/linux/nfslocalio.h
> index ab6a2a53f505..a05d1043f2b0 100644
> --- a/include/linux/nfslocalio.h
> +++ b/include/linux/nfslocalio.h
> @@ -37,8 +37,9 @@ bool nfs_uuid_begin(nfs_uuid_t *);
> void nfs_uuid_end(nfs_uuid_t *);
> void nfs_uuid_is_local(const uuid_t *, struct list_head *,
> struct net *, struct auth_domain *, struct module *);
> -void nfs_uuid_invalidate_clients(struct list_head *list);
> -void nfs_uuid_invalidate_one_client(nfs_uuid_t *nfs_uuid);
> +
> +void nfs_localio_disable_client(nfs_uuid_t *nfs_uuid);
> +void nfs_localio_invalidate_clients(struct list_head *list);
>
> /* localio needs to map filehandle -> struct nfsd_file */
> extern struct nfsd_file *
> --
> 2.44.0
>
>
