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>

diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h
index fac4123c918c84f77934b6af3c87b272ba180f9a..543ac486fd5d86a681c5c798137a3fd0d4882ae3 100644 (file)
--- 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 038348bc1a094a4159ae10707b781824fd16a0ac..6e17efdd8afe124f0cab54928779c44f71e71f23 100644 (file)
--- 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)