Revert "nfsd: call nfsd_last_thread() before final nfsd_put()"

This reverts commit bb4f791cb2de1140d0fbcedfe9e791ff364021d7 which is
commit 2a501f55cd641eb4d3c16a2eab0d678693fac663 upstream.

It is reported to cause issues, so revert it.

Reported-by: email200202 <email200202@yahoo.com>
Link: https://lore.kernel.org/r/e341cb408b5663d8c91b8fa57b41bb984be43448.camel@kernel.org
Cc: NeilBrown <neilb@suse.de>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index b3b4542e31ed5a97b4d73921f6f693980c64e520..573de0d49e1729c1dedef3dffd881490b2d9da27 100644 (file)
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -716,10 +716,8 @@ static ssize_t __write_ports_addfd(char *buf, struct net *net, const struct cred
 
        err = svc_addsock(nn->nfsd_serv, net, fd, buf, SIMPLE_TRANSACTION_LIMIT, cred);
 
-       if (err < 0 && !nn->nfsd_serv->sv_nrthreads && !nn->keep_active)
-               nfsd_last_thread(net);
-       else if (err >= 0 &&
-                !nn->nfsd_serv->sv_nrthreads && !xchg(&nn->keep_active, 1))
+       if (err >= 0 &&
+           !nn->nfsd_serv->sv_nrthreads && !xchg(&nn->keep_active, 1))
                svc_get(nn->nfsd_serv);
 
        nfsd_put(net);
@@ -769,9 +767,6 @@ out_close:
                svc_xprt_put(xprt);
        }
 out_err:
-       if (!nn->nfsd_serv->sv_nrthreads && !nn->keep_active)
-               nfsd_last_thread(net);
-
        nfsd_put(net);
        return err;
 }

diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
index 53166cce7062c3791ff471bb0d73303882d6960c..fddd70372e4cbb47bf8351fc244e0b1bf92150c1 100644 (file)
--- a/fs/nfsd/nfsd.h
+++ b/fs/nfsd/nfsd.h
@@ -139,7 +139,6 @@ 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);
 
 extern int nfsd_max_blksize;
 

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 350c6c72f793f59aa9b6022e3e18ef9fe6da69b0..add0e2519c9a8f3abf7a249a81bb3549d5bf4dc7 100644 (file)
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -523,7 +523,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)
+static void nfsd_last_thread(struct net *net)
 {
        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
        struct svc_serv *serv = nn->nfsd_serv;