diff options
author | Stanislav Kinsbursky <skinsbursky@parallels.com> | 2012-12-10 04:19:04 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-12-10 16:25:32 -0500 |
commit | f7fb86c6e639360ad9c253cec534819ef928a674 (patch) | |
tree | 5001ffc2c559f863b2c578963b32c1d4ed32536c /fs | |
parent | 7007c90fb9fef593b4aeaeee57e6a6754276c97c (diff) |
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>
Diffstat (limited to 'fs')
-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 b34a67d8ec4..9beace6a868 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c | |||
@@ -11,7 +11,6 @@ | |||
11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
12 | #include <linux/fs_struct.h> | 12 | #include <linux/fs_struct.h> |
13 | #include <linux/swap.h> | 13 | #include <linux/swap.h> |
14 | #include <linux/nsproxy.h> | ||
15 | 14 | ||
16 | #include <linux/sunrpc/stats.h> | 15 | #include <linux/sunrpc/stats.h> |
17 | #include <linux/sunrpc/svcsock.h> | 16 | #include <linux/sunrpc/svcsock.h> |
@@ -341,7 +340,7 @@ static int nfsd_get_default_max_blksize(void) | |||
341 | int nfsd_create_serv(void) | 340 | int nfsd_create_serv(void) |
342 | { | 341 | { |
343 | int error; | 342 | int error; |
344 | struct net *net = current->nsproxy->net_ns; | 343 | struct net *net = &init_net; |
345 | 344 | ||
346 | WARN_ON(!mutex_is_locked(&nfsd_mutex)); | 345 | WARN_ON(!mutex_is_locked(&nfsd_mutex)); |
347 | if (nfsd_serv) { | 346 | if (nfsd_serv) { |