summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Kinsbursky <skinsbursky@parallels.com>2012-12-06 14:23:14 +0300
committerJ. Bruce Fields <bfields@redhat.com>2012-12-10 16:25:37 -0500
commit2c2fe2909e124c32a34dbbb3ac129112524fc540 (patch)
treec96ad5c6af2e42654be6cd69380c34401356edb8
parent6ff50b3dea9a242b50642a703b513986bffb8ce9 (diff)
nfsd: per-net NFSd up flag introduced
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@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r--fs/nfsd/netns.h2
-rw-r--r--fs/nfsd/nfssvc.c12
2 files changed, 14 insertions, 0 deletions
diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h
index fac4123c918c..543ac486fd5d 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;
};
/* Simple check to find out if a given net was properly initialized */
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 038348bc1a09..6e17efdd8afe 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)