aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/route.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-09-12 06:01:34 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:49:06 -0400
commit457c4cbc5a3dde259d2a1f15d5f9785290397267 (patch)
treea2ceee88780cbce27433b9a4434b3e9251efd81a /net/ipv4/route.c
parent07feaebfcc10cd35e745c7073667935246494bee (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/route.c')
-rw-r--r--net/ipv4/route.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index c7ca94bd152c..efd2a9202d68 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -91,6 +91,7 @@
91#include <linux/jhash.h> 91#include <linux/jhash.h>
92#include <linux/rcupdate.h> 92#include <linux/rcupdate.h>
93#include <linux/times.h> 93#include <linux/times.h>
94#include <net/net_namespace.h>
94#include <net/protocol.h> 95#include <net/protocol.h>
95#include <net/ip.h> 96#include <net/ip.h>
96#include <net/route.h> 97#include <net/route.h>
@@ -3011,15 +3012,15 @@ int __init ip_rt_init(void)
3011#ifdef CONFIG_PROC_FS 3012#ifdef CONFIG_PROC_FS
3012 { 3013 {
3013 struct proc_dir_entry *rtstat_pde = NULL; /* keep gcc happy */ 3014 struct proc_dir_entry *rtstat_pde = NULL; /* keep gcc happy */
3014 if (!proc_net_fops_create("rt_cache", S_IRUGO, &rt_cache_seq_fops) || 3015 if (!proc_net_fops_create(&init_net, "rt_cache", S_IRUGO, &rt_cache_seq_fops) ||
3015 !(rtstat_pde = create_proc_entry("rt_cache", S_IRUGO, 3016 !(rtstat_pde = create_proc_entry("rt_cache", S_IRUGO,
3016 proc_net_stat))) { 3017 init_net.proc_net_stat))) {
3017 return -ENOMEM; 3018 return -ENOMEM;
3018 } 3019 }
3019 rtstat_pde->proc_fops = &rt_cpu_seq_fops; 3020 rtstat_pde->proc_fops = &rt_cpu_seq_fops;
3020 } 3021 }
3021#ifdef CONFIG_NET_CLS_ROUTE 3022#ifdef CONFIG_NET_CLS_ROUTE
3022 create_proc_read_entry("rt_acct", 0, proc_net, ip_rt_acct_read, NULL); 3023 create_proc_read_entry("rt_acct", 0, init_net.proc_net, ip_rt_acct_read, NULL);
3023#endif 3024#endif
3024#endif 3025#endif
3025#ifdef CONFIG_XFRM 3026#ifdef CONFIG_XFRM