From: Stanislav Kinsbursky <skinsbursky@parallels.com>
Date: Fri, 1 Feb 2013 12:56:27 +0000 (+0300)
Subject: nfsd: enable NFSv4 state in containers
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=deb4534f4f3be7aea7d9d24c3b0d58f370cbf9ef;p=linux-beck.git

nfsd: enable NFSv4 state in containers

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

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index c1a6ddf3a84a..f194f869be4c 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -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;