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/ipv6/anycast.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/ipv6/anycast.c')
-rw-r--r-- | net/ipv6/anycast.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c index b8c533fbdb63..0bd665498d06 100644 --- a/net/ipv6/anycast.c +++ b/net/ipv6/anycast.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/proc_fs.h> | 30 | #include <linux/proc_fs.h> |
31 | #include <linux/seq_file.h> | 31 | #include <linux/seq_file.h> |
32 | 32 | ||
33 | #include <net/net_namespace.h> | ||
33 | #include <net/sock.h> | 34 | #include <net/sock.h> |
34 | #include <net/snmp.h> | 35 | #include <net/snmp.h> |
35 | 36 | ||
@@ -578,7 +579,7 @@ static const struct file_operations ac6_seq_fops = { | |||
578 | 579 | ||
579 | int __init ac6_proc_init(void) | 580 | int __init ac6_proc_init(void) |
580 | { | 581 | { |
581 | if (!proc_net_fops_create("anycast6", S_IRUGO, &ac6_seq_fops)) | 582 | if (!proc_net_fops_create(&init_net, "anycast6", S_IRUGO, &ac6_seq_fops)) |
582 | return -ENOMEM; | 583 | return -ENOMEM; |
583 | 584 | ||
584 | return 0; | 585 | return 0; |
@@ -586,7 +587,7 @@ int __init ac6_proc_init(void) | |||
586 | 587 | ||
587 | void ac6_proc_exit(void) | 588 | void ac6_proc_exit(void) |
588 | { | 589 | { |
589 | proc_net_remove("anycast6"); | 590 | proc_net_remove(&init_net, "anycast6"); |
590 | } | 591 | } |
591 | #endif | 592 | #endif |
592 | 593 | ||