diff options
| author | Stanislav Kinsbursky <skinsbursky@parallels.com> | 2013-02-01 07:56:27 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2013-02-15 11:21:02 -0500 |
| commit | deb4534f4f3be7aea7d9d24c3b0d58f370cbf9ef (patch) | |
| tree | 2d6cf64c1d780141c29362e7b11e03054d8ce10b | |
| parent | 71a50306934f416e74ba27cbfb88855c22251525 (diff) | |
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>
| -rw-r--r-- | fs/nfsd/nfs4state.c | 10 |
1 files changed, 0 insertions, 10 deletions
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) | |||
| 4939 | struct nfsd_net *nn = net_generic(net, nfsd_net_id); | 4939 | struct nfsd_net *nn = net_generic(net, nfsd_net_id); |
| 4940 | int ret; | 4940 | int ret; |
| 4941 | 4941 | ||
| 4942 | /* | ||
| 4943 | * FIXME: For now, we hang most of the pernet global stuff off of | ||
| 4944 | * init_net until nfsd is fully containerized. Eventually, we'll | ||
| 4945 | * need to pass a net pointer into this function, take a reference | ||
| 4946 | * to that instead and then do most of the rest of this on a per-net | ||
| 4947 | * basis. | ||
| 4948 | */ | ||
| 4949 | if (net != &init_net) | ||
| 4950 | return -EINVAL; | ||
| 4951 | |||
| 4952 | ret = nfs4_state_create_net(net); | 4942 | ret = nfs4_state_create_net(net); |
| 4953 | if (ret) | 4943 | if (ret) |
| 4954 | return ret; | 4944 | return ret; |
