[PATCH 7/8] nfsd: replace boolean nfsd_up flag by users counter

From: Stanislav Kinsbursky
Date: Thu Dec 06 2012 - 06:23:44 EST


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: Stanislav Kinsbursky <skinsbursky@xxxxxxxxxxxxx>
---
fs/nfsd/nfssvc.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 0c87b4e..5bb4a33 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -204,13 +204,13 @@ static int nfsd_init_socks(struct net *net)
return 0;
}

-static bool nfsd_up = false;
+static int nfsd_users = 0;

static int nfsd_startup_generic(int nrservs)
{
int ret;

- if (nfsd_up)
+ if (nfsd_users++)
return 0;

/*
@@ -233,9 +233,11 @@ out_racache:

static void nfsd_shutdown_generic(void)
{
+ if (--nfsd_users)
+ return;
+
nfs4_state_shutdown();
nfsd_racache_shutdown();
- nfsd_up = false;
}

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;

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

out_lockd:

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/