nfsd: enable NFSv4 state in containers
authorStanislav Kinsbursky <skinsbursky@parallels.com>
Fri, 1 Feb 2013 12:56:27 +0000 (15:56 +0300)
committerJ. Bruce Fields <bfields@redhat.com>
Fri, 15 Feb 2013 16:21:02 +0000 (11:21 -0500)
Currently, NFSd is ready to operate in network namespace based containers.
So let's drop check for "init_net" and make it able to fly.

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/nfs4state.c

index c1a6ddf..f194f86 100644 (file)
@@ -4939,16 +4939,6 @@ nfs4_state_start_net(struct net *net)
        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
        int ret;
 
-       /*
-        * FIXME: For now, we hang most of the pernet global stuff off of
-        * init_net until nfsd is fully containerized. Eventually, we'll
-        * need to pass a net pointer into this function, take a reference
-        * to that instead and then do most of the rest of this on a per-net
-        * basis.
-        */
-       if (net != &init_net)
-               return -EINVAL;
-
        ret = nfs4_state_create_net(net);
        if (ret)
                return ret;