diff options
author | Stanislav Kinsbursky <skinsbursky@parallels.com> | 2012-01-23 12:26:05 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-02-06 18:48:02 -0500 |
commit | 6b13168b36b6a7f603d962c232f1f2f325705832 (patch) | |
tree | e524fb58428a8c128dcad8cf00cbd2692be9c6ad /fs/nfs/idmap.c | |
parent | a602bea3e7ccc5ce3da61d2c18245c4058983926 (diff) |
NFS: make nfs_client_list per net ns
This patch splits global list of NFS clients into per-net-ns array of lists.
This looks more strict and clearer.
BTW, this patch also makes "/proc/fs/nfsfs/servers" entry content depends on
/proc mount owner pid namespace. See below for details.
NOTE: few words about how was /proc/fs/nfsfs/ entries content show per network
namespace done. This is a little bit tricky and not the best is could be. But
it's cheap (proper fix for /proc conteinerization is a hard nut to crack).
The idea is simple: take proper network namespace from pid namespace
child reaper nsproxy of /proc/ mount creator.
This actually means, that if there are 2 containers with different net
namespace sharing pid namespace, then read of /proc/fs/nfsfs/ entries will
always return content, taken from net namespace of pid namespace creator task
(and thus second namespace set wil be unvisible).
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/idmap.c')
-rw-r--r-- | fs/nfs/idmap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c index 83f7d42d5c76..2f78f0ce2664 100644 --- a/fs/nfs/idmap.c +++ b/fs/nfs/idmap.c | |||
@@ -532,13 +532,12 @@ static int rpc_pipefs_event(struct notifier_block *nb, unsigned long event, | |||
532 | void *ptr) | 532 | void *ptr) |
533 | { | 533 | { |
534 | struct super_block *sb = ptr; | 534 | struct super_block *sb = ptr; |
535 | struct nfs_net *nn = net_generic(sb->s_fs_info, nfs_net_id); | ||
535 | struct nfs_client *clp; | 536 | struct nfs_client *clp; |
536 | int error = 0; | 537 | int error = 0; |
537 | 538 | ||
538 | spin_lock(&nfs_client_lock); | 539 | spin_lock(&nfs_client_lock); |
539 | list_for_each_entry(clp, &nfs_client_list, cl_share_link) { | 540 | list_for_each_entry(clp, &nn->nfs_client_list, cl_share_link) { |
540 | if (clp->net != sb->s_fs_info) | ||
541 | continue; | ||
542 | if (clp->rpc_ops != &nfs_v4_clientops) | 541 | if (clp->rpc_ops != &nfs_v4_clientops) |
543 | continue; | 542 | continue; |
544 | error = __rpc_pipefs_event(clp, event, sb); | 543 | error = __rpc_pipefs_event(clp, event, sb); |