aboutsummaryrefslogtreecommitdiffstats
path: root/net/rose
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/rose
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/rose')
-rw-r--r--net/rose/af_rose.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 976c3cc86a29..48319f7991ac 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -26,6 +26,7 @@
26#include <linux/sockios.h> 26#include <linux/sockios.h>
27#include <linux/net.h> 27#include <linux/net.h>
28#include <linux/stat.h> 28#include <linux/stat.h>
29#include <net/net_namespace.h>
29#include <net/ax25.h> 30#include <net/ax25.h>
30#include <linux/inet.h> 31#include <linux/inet.h>
31#include <linux/netdevice.h> 32#include <linux/netdevice.h>
@@ -1576,10 +1577,10 @@ static int __init rose_proto_init(void)
1576 1577
1577 rose_add_loopback_neigh(); 1578 rose_add_loopback_neigh();
1578 1579
1579 proc_net_fops_create("rose", S_IRUGO, &rose_info_fops); 1580 proc_net_fops_create(&init_net, "rose", S_IRUGO, &rose_info_fops);
1580 proc_net_fops_create("rose_neigh", S_IRUGO, &rose_neigh_fops); 1581 proc_net_fops_create(&init_net, "rose_neigh", S_IRUGO, &rose_neigh_fops);
1581 proc_net_fops_create("rose_nodes", S_IRUGO, &rose_nodes_fops); 1582 proc_net_fops_create(&init_net, "rose_nodes", S_IRUGO, &rose_nodes_fops);
1582 proc_net_fops_create("rose_routes", S_IRUGO, &rose_routes_fops); 1583 proc_net_fops_create(&init_net, "rose_routes", S_IRUGO, &rose_routes_fops);
1583out: 1584out:
1584 return rc; 1585 return rc;
1585fail: 1586fail:
@@ -1606,10 +1607,10 @@ static void __exit rose_exit(void)
1606{ 1607{
1607 int i; 1608 int i;
1608 1609
1609 proc_net_remove("rose"); 1610 proc_net_remove(&init_net, "rose");
1610 proc_net_remove("rose_neigh"); 1611 proc_net_remove(&init_net, "rose_neigh");
1611 proc_net_remove("rose_nodes"); 1612 proc_net_remove(&init_net, "rose_nodes");
1612 proc_net_remove("rose_routes"); 1613 proc_net_remove(&init_net, "rose_routes");
1613 rose_loopback_clear(); 1614 rose_loopback_clear();
1614 1615
1615 rose_rt_free(); 1616 rose_rt_free();