diff options
| author | Stanislav Kinsbursky <skinsbursky@parallels.com> | 2013-02-01 13:56:27 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2013-02-15 17:21:02 +0100 |
| commit | deb4534f4f3be7aea7d9d24c3b0d58f370cbf9ef (patch) | |
| tree | 2d6cf64c1d780141c29362e7b11e03054d8ce10b /fs/nfsd | |
| parent | nfsd: disable usermode helper client tracker in container (diff) | |
| download | linux-deb4534f4f3be7aea7d9d24c3b0d58f370cbf9ef.tar.xz linux-deb4534f4f3be7aea7d9d24c3b0d58f370cbf9ef.zip | |
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>
Diffstat (limited to 'fs/nfsd')
| -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) 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; |