dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Stanislav Kinsbursky 2012-12-06 14:23:44 +03:00 committed by J. Bruce Fields
parent 4539f14981
commit 541e864f00
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/nfsd/nfssvc.c
View File

@ -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: