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/ipv4/igmp.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/ipv4/igmp.c')
-rw-r--r-- | net/ipv4/igmp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index a646409c2d06..d78599a9dbd5 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c | |||
@@ -91,6 +91,7 @@ | |||
91 | #include <linux/rtnetlink.h> | 91 | #include <linux/rtnetlink.h> |
92 | #include <linux/times.h> | 92 | #include <linux/times.h> |
93 | 93 | ||
94 | #include <net/net_namespace.h> | ||
94 | #include <net/arp.h> | 95 | #include <net/arp.h> |
95 | #include <net/ip.h> | 96 | #include <net/ip.h> |
96 | #include <net/protocol.h> | 97 | #include <net/protocol.h> |
@@ -2613,8 +2614,8 @@ static const struct file_operations igmp_mcf_seq_fops = { | |||
2613 | 2614 | ||
2614 | int __init igmp_mc_proc_init(void) | 2615 | int __init igmp_mc_proc_init(void) |
2615 | { | 2616 | { |
2616 | proc_net_fops_create("igmp", S_IRUGO, &igmp_mc_seq_fops); | 2617 | proc_net_fops_create(&init_net, "igmp", S_IRUGO, &igmp_mc_seq_fops); |
2617 | proc_net_fops_create("mcfilter", S_IRUGO, &igmp_mcf_seq_fops); | 2618 | proc_net_fops_create(&init_net, "mcfilter", S_IRUGO, &igmp_mcf_seq_fops); |
2618 | return 0; | 2619 | return 0; |
2619 | } | 2620 | } |
2620 | #endif | 2621 | #endif |