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 /drivers/net/pppoe.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 'drivers/net/pppoe.c')
-rw-r--r-- | drivers/net/pppoe.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index 9b30cd600a64..ee8ce195c538 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c | |||
@@ -78,6 +78,7 @@ | |||
78 | #include <linux/proc_fs.h> | 78 | #include <linux/proc_fs.h> |
79 | #include <linux/seq_file.h> | 79 | #include <linux/seq_file.h> |
80 | 80 | ||
81 | #include <net/net_namespace.h> | ||
81 | #include <net/sock.h> | 82 | #include <net/sock.h> |
82 | 83 | ||
83 | #include <asm/uaccess.h> | 84 | #include <asm/uaccess.h> |
@@ -1042,7 +1043,7 @@ static int __init pppoe_proc_init(void) | |||
1042 | { | 1043 | { |
1043 | struct proc_dir_entry *p; | 1044 | struct proc_dir_entry *p; |
1044 | 1045 | ||
1045 | p = create_proc_entry("net/pppoe", S_IRUGO, NULL); | 1046 | p = create_proc_entry("pppoe", S_IRUGO, init_net.proc_net); |
1046 | if (!p) | 1047 | if (!p) |
1047 | return -ENOMEM; | 1048 | return -ENOMEM; |
1048 | 1049 | ||
@@ -1113,7 +1114,7 @@ static void __exit pppoe_exit(void) | |||
1113 | dev_remove_pack(&pppoes_ptype); | 1114 | dev_remove_pack(&pppoes_ptype); |
1114 | dev_remove_pack(&pppoed_ptype); | 1115 | dev_remove_pack(&pppoed_ptype); |
1115 | unregister_netdevice_notifier(&pppoe_notifier); | 1116 | unregister_netdevice_notifier(&pppoe_notifier); |
1116 | remove_proc_entry("net/pppoe", NULL); | 1117 | remove_proc_entry("pppoe", init_net.proc_net); |
1117 | proto_unregister(&pppoe_sk_proto); | 1118 | proto_unregister(&pppoe_sk_proto); |
1118 | } | 1119 | } |
1119 | 1120 | ||