On Mon, 2023-10-30 at 12:08 +1100, NeilBrown wrote:
> As this function now destroys the svc_serv, this is a better name.
>
> Signed-off-by: NeilBrown <neilb@xxxxxxx>
> ---
> fs/nfsd/nfsctl.c | 4 ++--
> fs/nfsd/nfsd.h | 2 +-
> fs/nfsd/nfssvc.c | 8 ++++----
> 3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
> index 86cab5281fd2..d603e672d568 100644
> --- a/fs/nfsd/nfsctl.c
> +++ b/fs/nfsd/nfsctl.c
> @@ -707,7 +707,7 @@ static ssize_t __write_ports_addfd(char *buf, struct net *net, const struct cred
>
> if (!nn->nfsd_serv->sv_nrthreads &&
> list_empty(&nn->nfsd_serv->sv_permsocks))
> - nfsd_last_thread(net);
> + nfsd_destroy_serv(net);
>
> return err;
> }
> @@ -754,7 +754,7 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct cr
> out_err:
> if (!nn->nfsd_serv->sv_nrthreads &&
> list_empty(&nn->nfsd_serv->sv_permsocks))
> - nfsd_last_thread(net);
> + nfsd_destroy_serv(net);
>
> return err;
> }
> diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
> index 9ed0e08d16c2..304e9728b929 100644
> --- a/fs/nfsd/nfsd.h
> +++ b/fs/nfsd/nfsd.h
> @@ -148,7 +148,7 @@ int nfsd_vers(struct nfsd_net *nn, int vers, enum vers_op change);
> int nfsd_minorversion(struct nfsd_net *nn, u32 minorversion, enum vers_op change);
> void nfsd_reset_versions(struct nfsd_net *nn);
> int nfsd_create_serv(struct net *net);
> -void nfsd_last_thread(struct net *net);
> +void nfsd_destroy_serv(struct net *net);
>
> extern int nfsd_max_blksize;
>
> diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
> index 61a1d966ca48..88c2e2c94829 100644
> --- a/fs/nfsd/nfssvc.c
> +++ b/fs/nfsd/nfssvc.c
> @@ -533,7 +533,7 @@ static struct notifier_block nfsd_inet6addr_notifier = {
> /* Only used under nfsd_mutex, so this atomic may be overkill: */
> static atomic_t nfsd_notifier_refcount = ATOMIC_INIT(0);
>
> -void nfsd_last_thread(struct net *net)
> +void nfsd_destroy_serv(struct net *net)
> {
> struct nfsd_net *nn = net_generic(net, nfsd_net_id);
> struct svc_serv *serv = nn->nfsd_serv;
> @@ -555,7 +555,7 @@ void nfsd_last_thread(struct net *net)
> /*
> * write_ports can create the server without actually starting
> * any threads--if we get shut down before any threads are
> - * started, then nfsd_last_thread will be run before any of this
> + * started, then nfsd_destroy_serv will be run before any of this
> * other initialization has been done except the rpcb information.
> */
> svc_rpcb_cleanup(serv, net);
> @@ -641,7 +641,7 @@ void nfsd_shutdown_threads(struct net *net)
>
> /* Kill outstanding nfsd threads */
> svc_set_num_threads(serv, NULL, 0);
> - nfsd_last_thread(net);
> + nfsd_destroy_serv(net);
> mutex_unlock(&nfsd_mutex);
> }
>
> @@ -802,7 +802,7 @@ nfsd_svc(int nrservs, struct net *net, const struct cred *cred)
> error = serv->sv_nrthreads;
> out_put:
> if (serv->sv_nrthreads == 0)
> - nfsd_last_thread(net);
> + nfsd_destroy_serv(net);
> out:
> mutex_unlock(&nfsd_mutex);
> return error;
LGTM
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
