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/ip6_flowlabel.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/ip6_flowlabel.c')
-rw-r--r-- | net/ipv6/ip6_flowlabel.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index 413a4ebb195c..1791399c7f10 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/proc_fs.h> | 21 | #include <linux/proc_fs.h> |
22 | #include <linux/seq_file.h> | 22 | #include <linux/seq_file.h> |
23 | 23 | ||
24 | #include <net/net_namespace.h> | ||
24 | #include <net/sock.h> | 25 | #include <net/sock.h> |
25 | 26 | ||
26 | #include <net/ipv6.h> | 27 | #include <net/ipv6.h> |
@@ -690,7 +691,7 @@ static const struct file_operations ip6fl_seq_fops = { | |||
690 | void ip6_flowlabel_init(void) | 691 | void ip6_flowlabel_init(void) |
691 | { | 692 | { |
692 | #ifdef CONFIG_PROC_FS | 693 | #ifdef CONFIG_PROC_FS |
693 | proc_net_fops_create("ip6_flowlabel", S_IRUGO, &ip6fl_seq_fops); | 694 | proc_net_fops_create(&init_net, "ip6_flowlabel", S_IRUGO, &ip6fl_seq_fops); |
694 | #endif | 695 | #endif |
695 | } | 696 | } |
696 | 697 | ||
@@ -698,6 +699,6 @@ void ip6_flowlabel_cleanup(void) | |||
698 | { | 699 | { |
699 | del_timer(&ip6_fl_gc_timer); | 700 | del_timer(&ip6_fl_gc_timer); |
700 | #ifdef CONFIG_PROC_FS | 701 | #ifdef CONFIG_PROC_FS |
701 | proc_net_remove("ip6_flowlabel"); | 702 | proc_net_remove(&init_net, "ip6_flowlabel"); |
702 | #endif | 703 | #endif |
703 | } | 704 | } |