summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfssvc.c
diff options
context:
space:
mode:
authorStanislav Kinsbursky <skinsbursky@parallels.com>2012-12-06 14:23:44 +0300
committerJ. Bruce Fields <bfields@redhat.com>2012-12-10 16:25:42 -0500
commit541e864f00d0062c98c1e743265b0a60cada3755 (patch)
tree05c87e9b6ba3a775c99a115a0dcde26b27d1d2b0 /fs/nfsd/nfssvc.c
parent4539f14981ce02d48b212786a41c8bcfb62851b4 (diff)
nfsd: simplify service shutdown
Function nfsd_shutdown is called from two places: nfsd_last_thread (when last kernel thread is exiting) and nfsd_svc (in case of kthreads starting error). When calling from nfsd_svc(), we can be sure that per-net resources are allocated, so we don't need to check per-net nfsd_net_up boolean flag. This allows us to remove nfsd_shutdown function at all and move check for per-net nfsd_net_up boolean flag to nfsd_last_thread. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfssvc.c')
-rw-r--r--fs/nfsd/nfssvc.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 5bb4a33211c..2cfd9c69503 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -281,7 +281,7 @@ static void nfsd_shutdown_net(struct net *net)
nfsd_shutdown_generic();
}
-static void nfsd_shutdown(struct net *net)
+static void nfsd_last_thread(struct svc_serv *serv, struct net *net)
{
struct nfsd_net *nn = net_generic(net, nfsd_net_id);
@@ -294,11 +294,6 @@ static void nfsd_shutdown(struct net *net)
if (!nn->nfsd_net_up)
return;
nfsd_shutdown_net(net);
-}
-
-static void nfsd_last_thread(struct svc_serv *serv, struct net *net)
-{
- nfsd_shutdown(net);
svc_rpcb_cleanup(serv, net);
@@ -530,7 +525,7 @@ nfsd_svc(int nrservs, struct net *net)
error = nn->nfsd_serv->sv_nrthreads - 1;
out_shutdown:
if (error < 0 && !nfsd_up_before)
- nfsd_shutdown(net);
+ nfsd_shutdown_net(net);
out_destroy:
nfsd_destroy(net); /* Release server */
out: