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/ipv4/ipmr.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/ipv4/ipmr.c')
-rw-r--r-- | net/ipv4/ipmr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 7003cc1b7fe2..35683e1a42e8 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -49,6 +49,7 @@ | |||
49 | #include <linux/mroute.h> | 49 | #include <linux/mroute.h> |
50 | #include <linux/init.h> | 50 | #include <linux/init.h> |
51 | #include <linux/if_ether.h> | 51 | #include <linux/if_ether.h> |
52 | #include <net/net_namespace.h> | ||
52 | #include <net/ip.h> | 53 | #include <net/ip.h> |
53 | #include <net/protocol.h> | 54 | #include <net/protocol.h> |
54 | #include <linux/skbuff.h> | 55 | #include <linux/skbuff.h> |
@@ -1922,7 +1923,7 @@ void __init ip_mr_init(void) | |||
1922 | ipmr_expire_timer.function=ipmr_expire_process; | 1923 | ipmr_expire_timer.function=ipmr_expire_process; |
1923 | register_netdevice_notifier(&ip_mr_notifier); | 1924 | register_netdevice_notifier(&ip_mr_notifier); |
1924 | #ifdef CONFIG_PROC_FS | 1925 | #ifdef CONFIG_PROC_FS |
1925 | proc_net_fops_create("ip_mr_vif", 0, &ipmr_vif_fops); | 1926 | proc_net_fops_create(&init_net, "ip_mr_vif", 0, &ipmr_vif_fops); |
1926 | proc_net_fops_create("ip_mr_cache", 0, &ipmr_mfc_fops); | 1927 | proc_net_fops_create(&init_net, "ip_mr_cache", 0, &ipmr_mfc_fops); |
1927 | #endif | 1928 | #endif |
1928 | } | 1929 | } |