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/decnet/dn_dev.c | |
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/decnet/dn_dev.c')
-rw-r--r-- | net/decnet/dn_dev.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c index 8def68209edd..83cb0761336a 100644 --- a/net/decnet/dn_dev.c +++ b/net/decnet/dn_dev.c | |||
@@ -42,6 +42,7 @@ | |||
42 | #include <linux/notifier.h> | 42 | #include <linux/notifier.h> |
43 | #include <asm/uaccess.h> | 43 | #include <asm/uaccess.h> |
44 | #include <asm/system.h> | 44 | #include <asm/system.h> |
45 | #include <net/net_namespace.h> | ||
45 | #include <net/neighbour.h> | 46 | #include <net/neighbour.h> |
46 | #include <net/dst.h> | 47 | #include <net/dst.h> |
47 | #include <net/flow.h> | 48 | #include <net/flow.h> |
@@ -1462,7 +1463,7 @@ void __init dn_dev_init(void) | |||
1462 | rtnl_register(PF_DECnet, RTM_DELADDR, dn_nl_deladdr, NULL); | 1463 | rtnl_register(PF_DECnet, RTM_DELADDR, dn_nl_deladdr, NULL); |
1463 | rtnl_register(PF_DECnet, RTM_GETADDR, NULL, dn_nl_dump_ifaddr); | 1464 | rtnl_register(PF_DECnet, RTM_GETADDR, NULL, dn_nl_dump_ifaddr); |
1464 | 1465 | ||
1465 | proc_net_fops_create("decnet_dev", S_IRUGO, &dn_dev_seq_fops); | 1466 | proc_net_fops_create(&init_net, "decnet_dev", S_IRUGO, &dn_dev_seq_fops); |
1466 | 1467 | ||
1467 | #ifdef CONFIG_SYSCTL | 1468 | #ifdef CONFIG_SYSCTL |
1468 | { | 1469 | { |
@@ -1483,7 +1484,7 @@ void __exit dn_dev_cleanup(void) | |||
1483 | } | 1484 | } |
1484 | #endif /* CONFIG_SYSCTL */ | 1485 | #endif /* CONFIG_SYSCTL */ |
1485 | 1486 | ||
1486 | proc_net_remove("decnet_dev"); | 1487 | proc_net_remove(&init_net, "decnet_dev"); |
1487 | 1488 | ||
1488 | dn_dev_devices_off(); | 1489 | dn_dev_devices_off(); |
1489 | } | 1490 | } |