[PATCH 2/8] nfsd: per-net NFSd up flag introduced

From: Stanislav Kinsbursky
Date: Thu Dec 06 2012 - 06:22:31 EST


This patch introduces introduces per-net "nfsd_net_up" boolean flag, which has
the same purpose as general "nfsd_up" flag - skip init or shutdown of per-net
resources in case of they are inited on shutted down respectively.

Signed-off-by: Stanislav Kinsbursky <skinsbursky@xxxxxxxxxxxxx>
---
fs/nfsd/netns.h | 2 ++
fs/nfsd/nfssvc.c | 12 ++++++++++++
2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h
index bca789d..da8741b 100644
--- a/fs/nfsd/netns.h
+++ b/fs/nfsd/netns.h
@@ -92,6 +92,8 @@ struct nfsd_net {

time_t nfsd4_lease;
time_t nfsd4_grace;
+
+ bool nfsd_net_up;
};

extern int nfsd_net_id;
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 038348b..6e17efd 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -21,6 +21,7 @@
#include "nfsd.h"
#include "cache.h"
#include "vfs.h"
+#include "netns.h"

#define NFSDDBG_FACILITY NFSDDBG_SVC

@@ -205,8 +206,12 @@ static bool nfsd_up = false;

static int nfsd_startup_net(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);
if (ret)
return ret;
@@ -217,6 +222,7 @@ static int nfsd_startup_net(struct net *net)
if (ret)
goto out_lockd;

+ nn->nfsd_net_up = true;
return 0;

out_lockd:
@@ -257,8 +263,14 @@ out_racache:

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;
}

static void nfsd_shutdown(struct net *net)

--
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/