aboutsummaryrefslogtreecommitdiffstats
path: root/net/decnet/dn_neigh.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/dn_neigh.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/dn_neigh.c')
-rw-r--r--net/decnet/dn_neigh.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c
index 174d8a7a6dac..a424a8ddbaf7 100644
--- a/net/decnet/dn_neigh.c
+++ b/net/decnet/dn_neigh.c
@@ -38,6 +38,7 @@
38#include <linux/rcupdate.h> 38#include <linux/rcupdate.h>
39#include <linux/jhash.h> 39#include <linux/jhash.h>
40#include <asm/atomic.h> 40#include <asm/atomic.h>
41#include <net/net_namespace.h>
41#include <net/neighbour.h> 42#include <net/neighbour.h>
42#include <net/dst.h> 43#include <net/dst.h>
43#include <net/flow.h> 44#include <net/flow.h>
@@ -611,11 +612,11 @@ static const struct file_operations dn_neigh_seq_fops = {
611void __init dn_neigh_init(void) 612void __init dn_neigh_init(void)
612{ 613{
613 neigh_table_init(&dn_neigh_table); 614 neigh_table_init(&dn_neigh_table);
614 proc_net_fops_create("decnet_neigh", S_IRUGO, &dn_neigh_seq_fops); 615 proc_net_fops_create(&init_net, "decnet_neigh", S_IRUGO, &dn_neigh_seq_fops);
615} 616}
616 617
617void __exit dn_neigh_cleanup(void) 618void __exit dn_neigh_cleanup(void)
618{ 619{
619 proc_net_remove("decnet_neigh"); 620 proc_net_remove(&init_net, "decnet_neigh");
620 neigh_table_clear(&dn_neigh_table); 621 neigh_table_clear(&dn_neigh_table);
621} 622}