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

nfsd: simplify NFSv4 state init and shutdown 

This patch moves nfsd_startup_generic() and nfsd_shutdown_generic()
calls to nfsd_startup_net() and nfsd_shutdown_net() respectively, which
allows us to call nfsd_startup_net() instead of nfsd_startup() and makes
the code look clearer.  It also modifies nfsd_svc() and nfsd_shutdown()
to check nn->nfsd_net_up instead of global nfsd_up.  The latter is now
used only for generic resources shutdown and is currently useless.  It
will replaced by NFSd users counter later in this series.

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:34 +03:00 committed by J. Bruce Fields
parent bda9cac1db
commit 903d9bf0ed
1 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
fs/nfsd/nfssvc.c
View File

@ -235,9 +235,10 @@ static void nfsd_shutdown_generic(void)
{ {
nfs4_state_shutdown(); nfs4_state_shutdown();
nfsd_racache_shutdown(); nfsd_racache_shutdown();
nfsd_up = false;
} }
static int nfsd_startup_net(struct net *net) static int nfsd_startup_net(int nrservs, struct net *net)
{ {
struct nfsd_net *nn = net_generic(net, nfsd_net_id); struct nfsd_net *nn = net_generic(net, nfsd_net_id);
int ret; int ret;
@ -245,39 +246,26 @@ static int nfsd_startup_net(struct net *net)
if (nn->nfsd_net_up) if (nn->nfsd_net_up)
return 0; return 0;
ret = nfsd_startup_generic(nrservs);
if (ret)
return ret;
ret = nfsd_init_socks(net); ret = nfsd_init_socks(net);
if (ret) if (ret)
return ret; goto out_socks;
ret = lockd_up(net); ret = lockd_up(net);
if (ret) if (ret)
return ret; goto out_socks;
ret = nfs4_state_start_net(net); ret = nfs4_state_start_net(net);
if (ret) if (ret)
goto out_lockd; goto out_lockd;
nn->nfsd_net_up = true; nn->nfsd_net_up = true;
nfsd_up = true;
return 0; return 0;
out_lockd: out_lockd:
lockd_down(net); lockd_down(net);
return ret; out_socks:
}
static int nfsd_startup(int nrservs, struct net *net)
{
int ret;
ret = nfsd_startup_generic(nrservs);
if (ret)
return ret;
ret = nfsd_startup_net(net);
if (ret)
goto out_net;
nfsd_up = true;
return 0;
out_net:
nfsd_shutdown_generic(); nfsd_shutdown_generic();
return ret; return ret;
} }
@ -286,27 +274,25 @@ static void nfsd_shutdown_net(struct net *net)
{ {
struct nfsd_net *nn = net_generic(net, nfsd_net_id); struct nfsd_net *nn = net_generic(net, nfsd_net_id);
if (!nn->nfsd_net_up)
return;
nfs4_state_shutdown_net(net); nfs4_state_shutdown_net(net);
lockd_down(net); lockd_down(net);
nn->nfsd_net_up = false; nn->nfsd_net_up = false;
nfsd_shutdown_generic();
} }
static void nfsd_shutdown(struct net *net) static void nfsd_shutdown(struct net *net)
{ {
struct nfsd_net *nn = net_generic(net, nfsd_net_id);
/* /*
* write_ports can create the server without actually starting * write_ports can create the server without actually starting
* any threads--if we get shut down before any threads are * any threads--if we get shut down before any threads are
* started, then nfsd_last_thread will be run before any of this * started, then nfsd_last_thread will be run before any of this
* other initialization has been done. * other initialization has been done.
*/ */
if (!nfsd_up) if (!nn->nfsd_net_up)
return; return;
nfsd_shutdown_net(net); nfsd_shutdown_net(net);
nfsd_shutdown_generic();
nfsd_up = false;
} }
static void nfsd_last_thread(struct svc_serv *serv, struct net *net) static void nfsd_last_thread(struct svc_serv *serv, struct net *net)
@ -528,9 +514,9 @@ nfsd_svc(int nrservs, struct net *net)
if (error) if (error)
goto out; goto out;
nfsd_up_before = nfsd_up; nfsd_up_before = nn->nfsd_net_up;
error = nfsd_startup(nrservs, net); error = nfsd_startup_net(nrservs, net);
if (error) if (error)
goto out_destroy; goto out_destroy;
error = svc_set_num_threads(nn->nfsd_serv, NULL, nrservs); error = svc_set_num_threads(nn->nfsd_serv, NULL, nrservs);