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/ipx | |
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/ipx')
-rw-r--r-- | net/ipx/ipx_proc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c index 4226e71ae1e3..d483a00dc427 100644 --- a/net/ipx/ipx_proc.c +++ b/net/ipx/ipx_proc.c | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <linux/proc_fs.h> | 9 | #include <linux/proc_fs.h> |
10 | #include <linux/spinlock.h> | 10 | #include <linux/spinlock.h> |
11 | #include <linux/seq_file.h> | 11 | #include <linux/seq_file.h> |
12 | #include <net/net_namespace.h> | ||
12 | #include <net/tcp_states.h> | 13 | #include <net/tcp_states.h> |
13 | #include <net/ipx.h> | 14 | #include <net/ipx.h> |
14 | 15 | ||
@@ -353,7 +354,7 @@ int __init ipx_proc_init(void) | |||
353 | struct proc_dir_entry *p; | 354 | struct proc_dir_entry *p; |
354 | int rc = -ENOMEM; | 355 | int rc = -ENOMEM; |
355 | 356 | ||
356 | ipx_proc_dir = proc_mkdir("ipx", proc_net); | 357 | ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net); |
357 | 358 | ||
358 | if (!ipx_proc_dir) | 359 | if (!ipx_proc_dir) |
359 | goto out; | 360 | goto out; |
@@ -381,7 +382,7 @@ out_socket: | |||
381 | out_route: | 382 | out_route: |
382 | remove_proc_entry("interface", ipx_proc_dir); | 383 | remove_proc_entry("interface", ipx_proc_dir); |
383 | out_interface: | 384 | out_interface: |
384 | remove_proc_entry("ipx", proc_net); | 385 | remove_proc_entry("ipx", init_net.proc_net); |
385 | goto out; | 386 | goto out; |
386 | } | 387 | } |
387 | 388 | ||
@@ -390,7 +391,7 @@ void __exit ipx_proc_exit(void) | |||
390 | remove_proc_entry("interface", ipx_proc_dir); | 391 | remove_proc_entry("interface", ipx_proc_dir); |
391 | remove_proc_entry("route", ipx_proc_dir); | 392 | remove_proc_entry("route", ipx_proc_dir); |
392 | remove_proc_entry("socket", ipx_proc_dir); | 393 | remove_proc_entry("socket", ipx_proc_dir); |
393 | remove_proc_entry("ipx", proc_net); | 394 | remove_proc_entry("ipx", init_net.proc_net); |
394 | } | 395 | } |
395 | 396 | ||
396 | #else /* CONFIG_PROC_FS */ | 397 | #else /* CONFIG_PROC_FS */ |