---

yaml --- r: 359743 b: refs/heads/master c: deb4534 h: refs/heads/master i: 359741: b6a9132 359739: 3533958 359735: af8d1e7 359727: 42da1f2 359711: c66a324 359679: ed40ea8 v: v3
git-mirror · Feb 15, 2013 · feda942 · feda942
1 parent 81e548b
commit feda942
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git 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
@@ -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;