aboutsummaryrefslogtreecommitdiffstats
path: root/net/decnet/af_decnet.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/decnet/af_decnet.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/decnet/af_decnet.c')
-rw-r--r--net/decnet/af_decnet.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index ed76d4aab4a9..625d5955b8e2 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -128,6 +128,7 @@ Version 0.0.6 2.1.110 07-aug-98 Eduardo Marcelo Serrat
128#include <linux/stat.h> 128#include <linux/stat.h>
129#include <linux/init.h> 129#include <linux/init.h>
130#include <linux/poll.h> 130#include <linux/poll.h>
131#include <net/net_namespace.h>
131#include <net/neighbour.h> 132#include <net/neighbour.h>
132#include <net/dst.h> 133#include <net/dst.h>
133#include <net/fib_rules.h> 134#include <net/fib_rules.h>
@@ -2399,7 +2400,7 @@ static int __init decnet_init(void)
2399 dev_add_pack(&dn_dix_packet_type); 2400 dev_add_pack(&dn_dix_packet_type);
2400 register_netdevice_notifier(&dn_dev_notifier); 2401 register_netdevice_notifier(&dn_dev_notifier);
2401 2402
2402 proc_net_fops_create("decnet", S_IRUGO, &dn_socket_seq_fops); 2403 proc_net_fops_create(&init_net, "decnet", S_IRUGO, &dn_socket_seq_fops);
2403 dn_register_sysctl(); 2404 dn_register_sysctl();
2404out: 2405out:
2405 return rc; 2406 return rc;
@@ -2428,7 +2429,7 @@ static void __exit decnet_exit(void)
2428 dn_neigh_cleanup(); 2429 dn_neigh_cleanup();
2429 dn_fib_cleanup(); 2430 dn_fib_cleanup();
2430 2431
2431 proc_net_remove("decnet"); 2432 proc_net_remove(&init_net, "decnet");
2432 2433
2433 proto_unregister(&dn_proto); 2434 proto_unregister(&dn_proto);
2434} 2435}