summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfsctl.c
diff options
context:
space:
mode:
authorStanislav Kinsbursky <skinsbursky@parallels.com>2012-07-03 16:46:41 +0400
committerJ. Bruce Fields <bfields@redhat.com>2012-07-25 09:21:30 -0400
commit19f7e2ca44dfc3c1b3f499fc46801f98d403500f (patch)
tree765d6e60ace4a723f5e0b8e393728b1a92bcd863 /fs/nfsd/nfsctl.c
parenta007c4c3e943ecc054a806c259d95420a188754b (diff)
downloadlinux-stable-19f7e2ca44dfc3c1b3f499fc46801f98d403500f.tar.gz
linux-stable-19f7e2ca44dfc3c1b3f499fc46801f98d403500f.tar.bz2
linux-stable-19f7e2ca44dfc3c1b3f499fc46801f98d403500f.zip
NFSd: introduce nfsd_destroy() helper
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfsctl.c')
-rw-r--r--fs/nfsd/nfsctl.c8
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;
}