diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2007-09-12 06:01:34 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:49:06 -0400 |
commit | 457c4cbc5a3dde259d2a1f15d5f9785290397267 (patch) | |
tree | a2ceee88780cbce27433b9a4434b3e9251efd81a /net/sunrpc | |
parent | 07feaebfcc10cd35e745c7073667935246494bee (diff) |
[NET]: Make /proc/net per network namespace
This patch makes /proc/net per network namespace. It modifies the global
variables proc_net and proc_net_stat to be per network namespace.
The proc_net file helpers are modified to take a network namespace argument,
and all of their callers are fixed to pass &init_net for that argument.
This ensures that all of the /proc/net files are only visible and
usable in the initial network namespace until the code behind them
has been updated to be handle multiple network namespaces.
Making /proc/net per namespace is necessary as at least some files
in /proc/net depend upon the set of network devices which is per
network namespace, and even more files in /proc/net have contents
that are relevant to a single network namespace.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sunrpc')
-rw-r--r-- | net/sunrpc/stats.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c index 74ba7d443dfc..4d4f3738b688 100644 --- a/net/sunrpc/stats.c +++ b/net/sunrpc/stats.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/sunrpc/clnt.h> | 21 | #include <linux/sunrpc/clnt.h> |
22 | #include <linux/sunrpc/svcsock.h> | 22 | #include <linux/sunrpc/svcsock.h> |
23 | #include <linux/sunrpc/metrics.h> | 23 | #include <linux/sunrpc/metrics.h> |
24 | #include <net/net_namespace.h> | ||
24 | 25 | ||
25 | #define RPCDBG_FACILITY RPCDBG_MISC | 26 | #define RPCDBG_FACILITY RPCDBG_MISC |
26 | 27 | ||
@@ -265,7 +266,7 @@ rpc_proc_init(void) | |||
265 | dprintk("RPC: registering /proc/net/rpc\n"); | 266 | dprintk("RPC: registering /proc/net/rpc\n"); |
266 | if (!proc_net_rpc) { | 267 | if (!proc_net_rpc) { |
267 | struct proc_dir_entry *ent; | 268 | struct proc_dir_entry *ent; |
268 | ent = proc_mkdir("rpc", proc_net); | 269 | ent = proc_mkdir("rpc", init_net.proc_net); |
269 | if (ent) { | 270 | if (ent) { |
270 | ent->owner = THIS_MODULE; | 271 | ent->owner = THIS_MODULE; |
271 | proc_net_rpc = ent; | 272 | proc_net_rpc = ent; |
@@ -279,7 +280,7 @@ rpc_proc_exit(void) | |||
279 | dprintk("RPC: unregistering /proc/net/rpc\n"); | 280 | dprintk("RPC: unregistering /proc/net/rpc\n"); |
280 | if (proc_net_rpc) { | 281 | if (proc_net_rpc) { |
281 | proc_net_rpc = NULL; | 282 | proc_net_rpc = NULL; |
282 | remove_proc_entry("net/rpc", NULL); | 283 | remove_proc_entry("rpc", init_net.proc_net); |
283 | } | 284 | } |
284 | } | 285 | } |
285 | 286 | ||