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/irda/irproc.c | |
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/irda/irproc.c')
-rw-r--r-- | net/irda/irproc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/irda/irproc.c b/net/irda/irproc.c index 181cb51b48a8..cae24fbda966 100644 --- a/net/irda/irproc.c +++ b/net/irda/irproc.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/seq_file.h> | 28 | #include <linux/seq_file.h> |
29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
31 | #include <net/net_namespace.h> | ||
31 | 32 | ||
32 | #include <net/irda/irda.h> | 33 | #include <net/irda/irda.h> |
33 | #include <net/irda/irlap.h> | 34 | #include <net/irda/irlap.h> |
@@ -66,7 +67,7 @@ void __init irda_proc_register(void) | |||
66 | int i; | 67 | int i; |
67 | struct proc_dir_entry *d; | 68 | struct proc_dir_entry *d; |
68 | 69 | ||
69 | proc_irda = proc_mkdir("irda", proc_net); | 70 | proc_irda = proc_mkdir("irda", init_net.proc_net); |
70 | if (proc_irda == NULL) | 71 | if (proc_irda == NULL) |
71 | return; | 72 | return; |
72 | proc_irda->owner = THIS_MODULE; | 73 | proc_irda->owner = THIS_MODULE; |
@@ -92,7 +93,7 @@ void irda_proc_unregister(void) | |||
92 | for (i=0; i<ARRAY_SIZE(irda_dirs); i++) | 93 | for (i=0; i<ARRAY_SIZE(irda_dirs); i++) |
93 | remove_proc_entry(irda_dirs[i].name, proc_irda); | 94 | remove_proc_entry(irda_dirs[i].name, proc_irda); |
94 | 95 | ||
95 | remove_proc_entry("irda", proc_net); | 96 | remove_proc_entry("irda", init_net.proc_net); |
96 | proc_irda = NULL; | 97 | proc_irda = NULL; |
97 | } | 98 | } |
98 | } | 99 | } |