diff options
author | Stanislav Kinsbursky <skinsbursky@parallels.com> | 2012-12-10 13:19:04 +0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-12-11 01:25:32 +0400 |
commit | f7fb86c6e639360ad9c253cec534819ef928a674 (patch) | |
tree | 5001ffc2c559f863b2c578963b32c1d4ed32536c | |
parent | 7007c90fb9fef593b4aeaeee57e6a6754276c97c (diff) | |
download | linux-f7fb86c6e639360ad9c253cec534819ef928a674.tar.xz |
nfsd: use "init_net" for portmapper
There could be a situation, when NFSd was started in one network namespace, but
stopped in another one.
This will trigger kernel panic, because RPCBIND client is stored on per-net
NFSd data, and will be NULL on NFSd shutdown.
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r-- | fs/nfsd/nfssvc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index b34a67d8ec44..9beace6a868c 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -11,7 +11,6 @@ #include <linux/module.h> #include <linux/fs_struct.h> #include <linux/swap.h> -#include <linux/nsproxy.h> #include <linux/sunrpc/stats.h> #include <linux/sunrpc/svcsock.h> @@ -341,7 +340,7 @@ static int nfsd_get_default_max_blksize(void) int nfsd_create_serv(void) { int error; - struct net *net = current->nsproxy->net_ns; + struct net *net = &init_net; WARN_ON(!mutex_is_locked(&nfsd_mutex)); if (nfsd_serv) { |