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/ipv6/addrconf.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/ipv6/addrconf.c')
-rw-r--r-- | net/ipv6/addrconf.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 45b4c82148a0..cd2db728d183 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -62,6 +62,7 @@ | |||
62 | #include <linux/notifier.h> | 62 | #include <linux/notifier.h> |
63 | #include <linux/string.h> | 63 | #include <linux/string.h> |
64 | 64 | ||
65 | #include <net/net_namespace.h> | ||
65 | #include <net/sock.h> | 66 | #include <net/sock.h> |
66 | #include <net/snmp.h> | 67 | #include <net/snmp.h> |
67 | 68 | ||
@@ -2827,14 +2828,14 @@ static const struct file_operations if6_fops = { | |||
2827 | 2828 | ||
2828 | int __init if6_proc_init(void) | 2829 | int __init if6_proc_init(void) |
2829 | { | 2830 | { |
2830 | if (!proc_net_fops_create("if_inet6", S_IRUGO, &if6_fops)) | 2831 | if (!proc_net_fops_create(&init_net, "if_inet6", S_IRUGO, &if6_fops)) |
2831 | return -ENOMEM; | 2832 | return -ENOMEM; |
2832 | return 0; | 2833 | return 0; |
2833 | } | 2834 | } |
2834 | 2835 | ||
2835 | void if6_proc_exit(void) | 2836 | void if6_proc_exit(void) |
2836 | { | 2837 | { |
2837 | proc_net_remove("if_inet6"); | 2838 | proc_net_remove(&init_net, "if_inet6"); |
2838 | } | 2839 | } |
2839 | #endif /* CONFIG_PROC_FS */ | 2840 | #endif /* CONFIG_PROC_FS */ |
2840 | 2841 | ||
@@ -4293,6 +4294,6 @@ void __exit addrconf_cleanup(void) | |||
4293 | rtnl_unlock(); | 4294 | rtnl_unlock(); |
4294 | 4295 | ||
4295 | #ifdef CONFIG_PROC_FS | 4296 | #ifdef CONFIG_PROC_FS |
4296 | proc_net_remove("if_inet6"); | 4297 | proc_net_remove(&init_net, "if_inet6"); |
4297 | #endif | 4298 | #endif |
4298 | } | 4299 | } |