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/8021q | |
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/8021q')
-rw-r--r-- | net/8021q/vlanproc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c index bd08aa090763..ac80e6b9ef53 100644 --- a/net/8021q/vlanproc.c +++ b/net/8021q/vlanproc.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/fs.h> | 33 | #include <linux/fs.h> |
34 | #include <linux/netdevice.h> | 34 | #include <linux/netdevice.h> |
35 | #include <linux/if_vlan.h> | 35 | #include <linux/if_vlan.h> |
36 | #include <net/net_namespace.h> | ||
36 | #include "vlanproc.h" | 37 | #include "vlanproc.h" |
37 | #include "vlan.h" | 38 | #include "vlan.h" |
38 | 39 | ||
@@ -143,7 +144,7 @@ void vlan_proc_cleanup(void) | |||
143 | remove_proc_entry(name_conf, proc_vlan_dir); | 144 | remove_proc_entry(name_conf, proc_vlan_dir); |
144 | 145 | ||
145 | if (proc_vlan_dir) | 146 | if (proc_vlan_dir) |
146 | proc_net_remove(name_root); | 147 | proc_net_remove(&init_net, name_root); |
147 | 148 | ||
148 | /* Dynamically added entries should be cleaned up as their vlan_device | 149 | /* Dynamically added entries should be cleaned up as their vlan_device |
149 | * is removed, so we should not have to take care of it here... | 150 | * is removed, so we should not have to take care of it here... |
@@ -156,7 +157,7 @@ void vlan_proc_cleanup(void) | |||
156 | 157 | ||
157 | int __init vlan_proc_init(void) | 158 | int __init vlan_proc_init(void) |
158 | { | 159 | { |
159 | proc_vlan_dir = proc_mkdir(name_root, proc_net); | 160 | proc_vlan_dir = proc_mkdir(name_root, init_net.proc_net); |
160 | if (proc_vlan_dir) { | 161 | if (proc_vlan_dir) { |
161 | proc_vlan_conf = create_proc_entry(name_conf, | 162 | proc_vlan_conf = create_proc_entry(name_conf, |
162 | S_IFREG|S_IRUSR|S_IWUSR, | 163 | S_IFREG|S_IRUSR|S_IWUSR, |