Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 347722
b: refs/heads/master
c: 903d9bf
h: refs/heads/master
v: v3
  • Loading branch information
Stanislav Kinsbursky authored and J. Bruce Fields committed Dec 10, 2012
1 parent 6a419f5 commit d880f10
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 30 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bda9cac1db8ab044e9edbfe5730283016b67d451
refs/heads/master: 903d9bf0edebc9d9f06df125ab2bd57b4aa4e78e
44 changes: 15 additions & 29 deletions trunk/fs/nfsd/nfssvc.c
Original file line number Diff line number Diff line change
Expand Up @@ -235,49 +235,37 @@ static void nfsd_shutdown_generic(void)
{
nfs4_state_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);
int ret;

if (nn->nfsd_net_up)
return 0;

ret = nfsd_init_socks(net);
ret = nfsd_startup_generic(nrservs);
if (ret)
return ret;
ret = nfsd_init_socks(net);
if (ret)
goto out_socks;
ret = lockd_up(net);
if (ret)
return ret;
goto out_socks;
ret = nfs4_state_start_net(net);
if (ret)
goto out_lockd;

nn->nfsd_net_up = true;
nfsd_up = true;
return 0;

out_lockd:
lockd_down(net);
return ret;
}

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:
out_socks:
nfsd_shutdown_generic();
return ret;
}
Expand All @@ -286,27 +274,25 @@ static void nfsd_shutdown_net(struct net *net)
{
struct nfsd_net *nn = net_generic(net, nfsd_net_id);

if (!nn->nfsd_net_up)
return;

nfs4_state_shutdown_net(net);
lockd_down(net);
nn->nfsd_net_up = false;
nfsd_shutdown_generic();
}

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
* any threads--if we get shut down before any threads are
* started, then nfsd_last_thread will be run before any of this
* other initialization has been done.
*/
if (!nfsd_up)
if (!nn->nfsd_net_up)
return;
nfsd_shutdown_net(net);
nfsd_shutdown_generic();
nfsd_up = false;
}

static void nfsd_last_thread(struct svc_serv *serv, struct net *net)
Expand Down Expand Up @@ -528,9 +514,9 @@ nfsd_svc(int nrservs, struct net *net)
if (error)
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)
goto out_destroy;
error = svc_set_num_threads(nn->nfsd_serv, NULL, nrservs);
Expand Down

0 comments on commit d880f10

Please sign in to comment.