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/pppol2tp.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/pppol2tp.c')
-rw-r--r-- | drivers/net/pppol2tp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c index abe91cb595f4..2eb424ba58e5 100644 --- a/drivers/net/pppol2tp.c +++ b/drivers/net/pppol2tp.c | |||
@@ -91,6 +91,7 @@ | |||
91 | #include <linux/hash.h> | 91 | #include <linux/hash.h> |
92 | #include <linux/sort.h> | 92 | #include <linux/sort.h> |
93 | #include <linux/proc_fs.h> | 93 | #include <linux/proc_fs.h> |
94 | #include <net/net_namespace.h> | ||
94 | #include <net/dst.h> | 95 | #include <net/dst.h> |
95 | #include <net/ip.h> | 96 | #include <net/ip.h> |
96 | #include <net/udp.h> | 97 | #include <net/udp.h> |
@@ -2444,7 +2445,7 @@ static int __init pppol2tp_init(void) | |||
2444 | goto out_unregister_pppol2tp_proto; | 2445 | goto out_unregister_pppol2tp_proto; |
2445 | 2446 | ||
2446 | #ifdef CONFIG_PROC_FS | 2447 | #ifdef CONFIG_PROC_FS |
2447 | pppol2tp_proc = create_proc_entry("pppol2tp", 0, proc_net); | 2448 | pppol2tp_proc = create_proc_entry("pppol2tp", 0, init_net.proc_net); |
2448 | if (!pppol2tp_proc) { | 2449 | if (!pppol2tp_proc) { |
2449 | err = -ENOMEM; | 2450 | err = -ENOMEM; |
2450 | goto out_unregister_pppox_proto; | 2451 | goto out_unregister_pppox_proto; |
@@ -2469,7 +2470,7 @@ static void __exit pppol2tp_exit(void) | |||
2469 | unregister_pppox_proto(PX_PROTO_OL2TP); | 2470 | unregister_pppox_proto(PX_PROTO_OL2TP); |
2470 | 2471 | ||
2471 | #ifdef CONFIG_PROC_FS | 2472 | #ifdef CONFIG_PROC_FS |
2472 | remove_proc_entry("pppol2tp", proc_net); | 2473 | remove_proc_entry("pppol2tp", init_net.proc_net); |
2473 | #endif | 2474 | #endif |
2474 | proto_unregister(&pppol2tp_sk_proto); | 2475 | proto_unregister(&pppol2tp_sk_proto); |
2475 | } | 2476 | } |