diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2007-09-12 06:01:34 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:49:06 -0400 |
commit | 457c4cbc5a3dde259d2a1f15d5f9785290397267 (patch) | |
tree | a2ceee88780cbce27433b9a4434b3e9251efd81a /net/netrom | |
parent | 07feaebfcc10cd35e745c7073667935246494bee (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/netrom')
-rw-r--r-- | net/netrom/af_netrom.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index dc9273295a38..15c8a92bd719 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/netdevice.h> | 27 | #include <linux/netdevice.h> |
28 | #include <linux/if_arp.h> | 28 | #include <linux/if_arp.h> |
29 | #include <linux/skbuff.h> | 29 | #include <linux/skbuff.h> |
30 | #include <net/net_namespace.h> | ||
30 | #include <net/sock.h> | 31 | #include <net/sock.h> |
31 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
32 | #include <asm/system.h> | 33 | #include <asm/system.h> |
@@ -1447,9 +1448,9 @@ static int __init nr_proto_init(void) | |||
1447 | 1448 | ||
1448 | nr_loopback_init(); | 1449 | nr_loopback_init(); |
1449 | 1450 | ||
1450 | proc_net_fops_create("nr", S_IRUGO, &nr_info_fops); | 1451 | proc_net_fops_create(&init_net, "nr", S_IRUGO, &nr_info_fops); |
1451 | proc_net_fops_create("nr_neigh", S_IRUGO, &nr_neigh_fops); | 1452 | proc_net_fops_create(&init_net, "nr_neigh", S_IRUGO, &nr_neigh_fops); |
1452 | proc_net_fops_create("nr_nodes", S_IRUGO, &nr_nodes_fops); | 1453 | proc_net_fops_create(&init_net, "nr_nodes", S_IRUGO, &nr_nodes_fops); |
1453 | out: | 1454 | out: |
1454 | return rc; | 1455 | return rc; |
1455 | fail: | 1456 | fail: |
@@ -1477,9 +1478,9 @@ static void __exit nr_exit(void) | |||
1477 | { | 1478 | { |
1478 | int i; | 1479 | int i; |
1479 | 1480 | ||
1480 | proc_net_remove("nr"); | 1481 | proc_net_remove(&init_net, "nr"); |
1481 | proc_net_remove("nr_neigh"); | 1482 | proc_net_remove(&init_net, "nr_neigh"); |
1482 | proc_net_remove("nr_nodes"); | 1483 | proc_net_remove(&init_net, "nr_nodes"); |
1483 | nr_loopback_clear(); | 1484 | nr_loopback_clear(); |
1484 | 1485 | ||
1485 | nr_rt_free(); | 1486 | nr_rt_free(); |