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/ipvs/ip_vs_app.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/ipvs/ip_vs_app.c')
-rw-r--r-- | net/ipv4/ipvs/ip_vs_app.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/ipvs/ip_vs_app.c b/net/ipv4/ipvs/ip_vs_app.c index 8d6901d4e94f..341474eefa55 100644 --- a/net/ipv4/ipvs/ip_vs_app.c +++ b/net/ipv4/ipvs/ip_vs_app.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/skbuff.h> | 25 | #include <linux/skbuff.h> |
26 | #include <linux/in.h> | 26 | #include <linux/in.h> |
27 | #include <linux/ip.h> | 27 | #include <linux/ip.h> |
28 | #include <net/net_namespace.h> | ||
28 | #include <net/protocol.h> | 29 | #include <net/protocol.h> |
29 | #include <net/tcp.h> | 30 | #include <net/tcp.h> |
30 | #include <asm/system.h> | 31 | #include <asm/system.h> |
@@ -616,12 +617,12 @@ int ip_vs_skb_replace(struct sk_buff *skb, gfp_t pri, | |||
616 | int ip_vs_app_init(void) | 617 | int ip_vs_app_init(void) |
617 | { | 618 | { |
618 | /* we will replace it with proc_net_ipvs_create() soon */ | 619 | /* we will replace it with proc_net_ipvs_create() soon */ |
619 | proc_net_fops_create("ip_vs_app", 0, &ip_vs_app_fops); | 620 | proc_net_fops_create(&init_net, "ip_vs_app", 0, &ip_vs_app_fops); |
620 | return 0; | 621 | return 0; |
621 | } | 622 | } |
622 | 623 | ||
623 | 624 | ||
624 | void ip_vs_app_cleanup(void) | 625 | void ip_vs_app_cleanup(void) |
625 | { | 626 | { |
626 | proc_net_remove("ip_vs_app"); | 627 | proc_net_remove(&init_net, "ip_vs_app"); |
627 | } | 628 | } |