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/atm | |
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/atm')
-rw-r--r-- | net/atm/proc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/atm/proc.c b/net/atm/proc.c index 99fc1fe950ee..3a6be64b0512 100644 --- a/net/atm/proc.c +++ b/net/atm/proc.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/netdevice.h> | 22 | #include <linux/netdevice.h> |
23 | #include <linux/atmclip.h> | 23 | #include <linux/atmclip.h> |
24 | #include <linux/init.h> /* for __init */ | 24 | #include <linux/init.h> /* for __init */ |
25 | #include <net/net_namespace.h> | ||
25 | #include <net/atmclip.h> | 26 | #include <net/atmclip.h> |
26 | #include <asm/uaccess.h> | 27 | #include <asm/uaccess.h> |
27 | #include <asm/atomic.h> | 28 | #include <asm/atomic.h> |
@@ -475,7 +476,7 @@ static void atm_proc_dirs_remove(void) | |||
475 | if (e->dirent) | 476 | if (e->dirent) |
476 | remove_proc_entry(e->name, atm_proc_root); | 477 | remove_proc_entry(e->name, atm_proc_root); |
477 | } | 478 | } |
478 | remove_proc_entry("net/atm", NULL); | 479 | remove_proc_entry("atm", init_net.proc_net); |
479 | } | 480 | } |
480 | 481 | ||
481 | int __init atm_proc_init(void) | 482 | int __init atm_proc_init(void) |
@@ -483,7 +484,7 @@ int __init atm_proc_init(void) | |||
483 | static struct atm_proc_entry *e; | 484 | static struct atm_proc_entry *e; |
484 | int ret; | 485 | int ret; |
485 | 486 | ||
486 | atm_proc_root = proc_mkdir("net/atm",NULL); | 487 | atm_proc_root = proc_mkdir("atm", init_net.proc_net); |
487 | if (!atm_proc_root) | 488 | if (!atm_proc_root) |
488 | goto err_out; | 489 | goto err_out; |
489 | for (e = atm_proc_ents; e->name; e++) { | 490 | for (e = atm_proc_ents; e->name; e++) { |