1 files changed, 8 insertions, 16 deletions

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index ee709fc8f58b..240473cb708f 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -254,8 +254,6 @@ static void nfsd_shutdown(void)
 
 static void nfsd_last_thread(struct svc_serv *serv, struct net *net)
 {
-        /* When last nfsd thread exits we need to do some clean-up */
-        nfsd_serv = NULL;
         nfsd_shutdown();
 
         svc_rpcb_cleanup(serv, net);
@@ -332,6 +330,7 @@ static int nfsd_get_default_max_blksize(void)
 int nfsd_create_serv(void)
 {
         int error;
+        struct net *net = current->nsproxy->net_ns;
 
         WARN_ON(!mutex_is_locked(&nfsd_mutex));
         if (nfsd_serv) {
@@ -346,7 +345,7 @@ int nfsd_create_serv(void)
         if (nfsd_serv == NULL)
                 return -ENOMEM;
 
-        error = svc_bind(nfsd_serv, current->nsproxy->net_ns);
+        error = svc_bind(nfsd_serv, net);
         if (error < 0) {
                 svc_destroy(nfsd_serv);
                 return error;
@@ -427,11 +426,7 @@ int nfsd_set_nrthreads(int n, int *nthreads)
                 if (err)
                         break;
         }
-
-        if (nfsd_serv->sv_nrthreads == 1)
-                svc_shutdown_net(nfsd_serv, net);
-        svc_destroy(nfsd_serv);
-
+        nfsd_destroy(net);
         return err;
 }
 
@@ -478,9 +473,7 @@ out_shutdown:
         if (error < 0 && !nfsd_up_before)
                 nfsd_shutdown();
 out_destroy:
-        if (nfsd_serv->sv_nrthreads == 1)
-                svc_shutdown_net(nfsd_serv, net);
-        svc_destroy(nfsd_serv);         /* Release server */
+        nfsd_destroy(net);              /* Release server */
 out:
         mutex_unlock(&nfsd_mutex);
         return error;
@@ -563,12 +556,13 @@ nfsd(void *vrqstp)
         nfsdstats.th_cnt --;
 
 out:
-        if (rqstp->rq_server->sv_nrthreads == 1)
-                svc_shutdown_net(rqstp->rq_server, &init_net);
+        rqstp->rq_server = NULL;
 
         /* Release the thread */
         svc_exit_thread(rqstp);
 
+        nfsd_destroy(&init_net);
+
         /* Release module */
         mutex_unlock(&nfsd_mutex);
         module_put_and_exit(0);
@@ -682,9 +676,7 @@ int nfsd_pool_stats_release(struct inode *inode, struct file *file)
 
         mutex_lock(&nfsd_mutex);
         /* this function really, really should have been called svc_put() */
-        if (nfsd_serv->sv_nrthreads == 1)
-                svc_shutdown_net(nfsd_serv, net);
-        svc_destroy(nfsd_serv);
+        nfsd_destroy(net);
         mutex_unlock(&nfsd_mutex);
         return ret;
 }