NFSd: introduce nfsd_destroy() helper

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index c55298ed5772..fa49cff5ee65 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -673,9 +673,7 @@ 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);
+                nfsd_destroy(net);
                 return err;
         }
 
@@ -744,9 +742,7 @@ out_close:
                 svc_xprt_put(xprt);
         }
 out_err:
-        if (nfsd_serv->sv_nrthreads == 1)
-                svc_shutdown_net(nfsd_serv, net);
-        svc_destroy(nfsd_serv);
+        nfsd_destroy(net);
         return err;
 }