Commit 4539f149 authored by Stanislav Kinsbursky's avatar Stanislav Kinsbursky Committed by J. Bruce Fields

nfsd: replace boolean nfsd_up flag by users counter

Since we have generic NFSd resurces, we have to introduce some way how to
allocate and destroy those resources on first per-net NFSd start and on
last per-net NFSd stop respectively.
This patch replaces global boolean nfsd_up flag (which is unused now) by users
counter and use it to determine either we need to allocate generic resources
or destroy them.
Signed-off-by: default avatarStanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 903d9bf0
...@@ -204,13 +204,13 @@ static int nfsd_init_socks(struct net *net) ...@@ -204,13 +204,13 @@ static int nfsd_init_socks(struct net *net)
return 0; return 0;
} }
static bool nfsd_up = false; static int nfsd_users = 0;
static int nfsd_startup_generic(int nrservs) static int nfsd_startup_generic(int nrservs)
{ {
int ret; int ret;
if (nfsd_up) if (nfsd_users++)
return 0; return 0;
/* /*
...@@ -233,9 +233,11 @@ static int nfsd_startup_generic(int nrservs) ...@@ -233,9 +233,11 @@ static int nfsd_startup_generic(int nrservs)
static void nfsd_shutdown_generic(void) static void nfsd_shutdown_generic(void)
{ {
if (--nfsd_users)
return;
nfs4_state_shutdown(); nfs4_state_shutdown();
nfsd_racache_shutdown(); nfsd_racache_shutdown();
nfsd_up = false;
} }
static int nfsd_startup_net(int nrservs, struct net *net) static int nfsd_startup_net(int nrservs, struct net *net)
...@@ -260,7 +262,6 @@ static int nfsd_startup_net(int nrservs, struct net *net) ...@@ -260,7 +262,6 @@ static int nfsd_startup_net(int nrservs, struct net *net)
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:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment