aboutsummaryrefslogtreecommitdiffstats
path: root/net/ax25/af_ax25.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/ax25/af_ax25.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/ax25/af_ax25.c')
-rw-r--r--net/ax25/af_ax25.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index dae2a42d3d86..1d71f85680b8 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -44,6 +44,7 @@
44#include <linux/sysctl.h> 44#include <linux/sysctl.h>
45#include <linux/init.h> 45#include <linux/init.h>
46#include <linux/spinlock.h> 46#include <linux/spinlock.h>
47#include <net/net_namespace.h>
47#include <net/tcp_states.h> 48#include <net/tcp_states.h>
48#include <net/ip.h> 49#include <net/ip.h>
49#include <net/arp.h> 50#include <net/arp.h>
@@ -1998,9 +1999,9 @@ static int __init ax25_init(void)
1998 register_netdevice_notifier(&ax25_dev_notifier); 1999 register_netdevice_notifier(&ax25_dev_notifier);
1999 ax25_register_sysctl(); 2000 ax25_register_sysctl();
2000 2001
2001 proc_net_fops_create("ax25_route", S_IRUGO, &ax25_route_fops); 2002 proc_net_fops_create(&init_net, "ax25_route", S_IRUGO, &ax25_route_fops);
2002 proc_net_fops_create("ax25", S_IRUGO, &ax25_info_fops); 2003 proc_net_fops_create(&init_net, "ax25", S_IRUGO, &ax25_info_fops);
2003 proc_net_fops_create("ax25_calls", S_IRUGO, &ax25_uid_fops); 2004 proc_net_fops_create(&init_net, "ax25_calls", S_IRUGO, &ax25_uid_fops);
2004out: 2005out:
2005 return rc; 2006 return rc;
2006} 2007}
@@ -2014,9 +2015,9 @@ MODULE_ALIAS_NETPROTO(PF_AX25);
2014 2015
2015static void __exit ax25_exit(void) 2016static void __exit ax25_exit(void)
2016{ 2017{
2017 proc_net_remove("ax25_route"); 2018 proc_net_remove(&init_net, "ax25_route");
2018 proc_net_remove("ax25"); 2019 proc_net_remove(&init_net, "ax25");
2019 proc_net_remove("ax25_calls"); 2020 proc_net_remove(&init_net, "ax25_calls");
2020 ax25_rt_free(); 2021 ax25_rt_free();
2021 ax25_uid_free(); 2022 ax25_uid_free();
2022 ax25_dev_free(); 2023 ax25_dev_free();