2 files changed, 23 insertions, 3 deletions

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 72699885ac48..c55298ed5772 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -661,6 +661,7 @@ static ssize_t __write_ports_addfd(char *buf)
 {
         char *mesg = buf;
         int fd, err;
+        struct net *net = &init_net;
 
         err = get_int(&mesg, &fd);
         if (err != 0 || fd < 0)
@@ -672,6 +673,8 @@ static ssize_t __write_ports_addfd(char *buf)
 
         err = svc_addsock(nfsd_serv, fd, buf, SIMPLE_TRANSACTION_LIMIT);
         if (err < 0) {
+                if (nfsd_serv->sv_nrthreads == 1)
+                        svc_shutdown_net(nfsd_serv, net);
                 svc_destroy(nfsd_serv);
                 return err;
         }
@@ -709,6 +712,7 @@ static ssize_t __write_ports_addxprt(char *buf)
         char transport[16];
         struct svc_xprt *xprt;
         int port, err;
+        struct net *net = &init_net;
 
         if (sscanf(buf, "%15s %4u", transport, &port) != 2)
                 return -EINVAL;
@@ -720,12 +724,12 @@ static ssize_t __write_ports_addxprt(char *buf)
         if (err != 0)
                 return err;
 
-        err = svc_create_xprt(nfsd_serv, transport, &init_net,
+        err = svc_create_xprt(nfsd_serv, transport, net,
                                 PF_INET, port, SVC_SOCK_ANONYMOUS);
         if (err < 0)
                 goto out_err;
 
-        err = svc_create_xprt(nfsd_serv, transport, &init_net,
+        err = svc_create_xprt(nfsd_serv, transport, net,
                                 PF_INET6, port, SVC_SOCK_ANONYMOUS);
         if (err < 0 && err != -EAFNOSUPPORT)
                 goto out_close;
@@ -734,12 +738,14 @@ static ssize_t __write_ports_addxprt(char *buf)
         nfsd_serv->sv_nrthreads--;
         return 0;
 out_close:
-        xprt = svc_find_xprt(nfsd_serv, transport, &init_net, PF_INET, port);
+        xprt = svc_find_xprt(nfsd_serv, transport, net, PF_INET, port);
         if (xprt != NULL) {
                 svc_close_xprt(xprt);
                 svc_xprt_put(xprt);
         }
 out_err:
+        if (nfsd_serv->sv_nrthreads == 1)
+                svc_shutdown_net(nfsd_serv, net);
         svc_destroy(nfsd_serv);
         return err;
 }
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 0762f3c9e0fb..ee709fc8f58b 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -382,6 +382,7 @@ int nfsd_set_nrthreads(int n, int *nthreads)
         int i = 0;
         int tot = 0;
         int err = 0;
+        struct net *net = &init_net;
 
         WARN_ON(!mutex_is_locked(&nfsd_mutex));
 
@@ -426,6 +427,9 @@ 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);
 
         return err;
@@ -441,6 +445,7 @@ nfsd_svc(unsigned short port, int nrservs)
 {
         int     error;
         bool    nfsd_up_before;
+        struct net *net = &init_net;
 
         mutex_lock(&nfsd_mutex);
         dprintk("nfsd: creating service\n");
@@ -473,6 +478,8 @@ 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 */
 out:
         mutex_unlock(&nfsd_mutex);
@@ -556,6 +563,9 @@ nfsd(void *vrqstp)
         nfsdstats.th_cnt --;
 
 out:
+        if (rqstp->rq_server->sv_nrthreads == 1)
+                svc_shutdown_net(rqstp->rq_server, &init_net);
+
         /* Release the thread */
         svc_exit_thread(rqstp);
 
@@ -668,8 +678,12 @@ int nfsd_pool_stats_open(struct inode *inode, struct file *file)
 int nfsd_pool_stats_release(struct inode *inode, struct file *file)
 {
         int ret = seq_release(inode, file);
+        struct net *net = &init_net;
+
         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);
         mutex_unlock(&nfsd_mutex);
         return ret;