From feda94258ab8682e3ee952551cb07f507ac295c5 Mon Sep 17 00:00:00 2001
From: Stanislav Kinsbursky <skinsbursky@parallels.com>
Date: Fri, 1 Feb 2013 15:56:27 +0300
Subject: [PATCH] --- yaml --- r: 359743 b: refs/heads/master c:
 deb4534f4f3be7aea7d9d24c3b0d58f370cbf9ef h: refs/heads/master i:   359741:
 b6a913255739ff23b0ac9a3f3bb50edf29915544   359739:
 35339580aaed1d0feed5eb25593f3704d12b5182   359735:
 af8d1e70da4acef1e4c82493be2b7fea591a2431   359727:
 42da1f21a860d104aecc6fa04a7e2f17951f2b9c   359711:
 c66a324517520026b15ce34980639b27618fb677   359679:
 ed40ea89f9ee9578e786f6e579bba77d537f7190 v: v3

---
 [refs]                    |  2 +-
 trunk/fs/nfsd/nfs4state.c | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 67b8afb1f669..945534e48e60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71a50306934f416e74ba27cbfb88855c22251525
+refs/heads/master: deb4534f4f3be7aea7d9d24c3b0d58f370cbf9ef
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
index c1a6ddf3a84a..f194f869be4c 100644
--- a/trunk/fs/nfsd/nfs4state.c
+++ b/trunk/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;