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_ctl.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_ctl.c')
-rw-r--r-- | net/ipv4/ipvs/ip_vs_ctl.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c index f656d41d8d41..61d023d58b5d 100644 --- a/net/ipv4/ipvs/ip_vs_ctl.c +++ b/net/ipv4/ipvs/ip_vs_ctl.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <linux/netfilter_ipv4.h> | 35 | #include <linux/netfilter_ipv4.h> |
36 | #include <linux/mutex.h> | 36 | #include <linux/mutex.h> |
37 | 37 | ||
38 | #include <net/net_namespace.h> | ||
38 | #include <net/ip.h> | 39 | #include <net/ip.h> |
39 | #include <net/route.h> | 40 | #include <net/route.h> |
40 | #include <net/sock.h> | 41 | #include <net/sock.h> |
@@ -2356,8 +2357,8 @@ int ip_vs_control_init(void) | |||
2356 | return ret; | 2357 | return ret; |
2357 | } | 2358 | } |
2358 | 2359 | ||
2359 | proc_net_fops_create("ip_vs", 0, &ip_vs_info_fops); | 2360 | proc_net_fops_create(&init_net, "ip_vs", 0, &ip_vs_info_fops); |
2360 | proc_net_fops_create("ip_vs_stats",0, &ip_vs_stats_fops); | 2361 | proc_net_fops_create(&init_net, "ip_vs_stats",0, &ip_vs_stats_fops); |
2361 | 2362 | ||
2362 | sysctl_header = register_sysctl_table(vs_root_table); | 2363 | sysctl_header = register_sysctl_table(vs_root_table); |
2363 | 2364 | ||
@@ -2390,8 +2391,8 @@ void ip_vs_control_cleanup(void) | |||
2390 | cancel_work_sync(&defense_work.work); | 2391 | cancel_work_sync(&defense_work.work); |
2391 | ip_vs_kill_estimator(&ip_vs_stats); | 2392 | ip_vs_kill_estimator(&ip_vs_stats); |
2392 | unregister_sysctl_table(sysctl_header); | 2393 | unregister_sysctl_table(sysctl_header); |
2393 | proc_net_remove("ip_vs_stats"); | 2394 | proc_net_remove(&init_net, "ip_vs_stats"); |
2394 | proc_net_remove("ip_vs"); | 2395 | proc_net_remove(&init_net, "ip_vs"); |
2395 | nf_unregister_sockopt(&ip_vs_sockopts); | 2396 | nf_unregister_sockopt(&ip_vs_sockopts); |
2396 | LeaveFunction(2); | 2397 | LeaveFunction(2); |
2397 | } | 2398 | } |