aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ipvs/ip_vs_lblcr.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-09-12 06:01:34 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:49:06 -0400
commit457c4cbc5a3dde259d2a1f15d5f9785290397267 (patch)
treea2ceee88780cbce27433b9a4434b3e9251efd81a /net/ipv4/ipvs/ip_vs_lblcr.c
parent07feaebfcc10cd35e745c7073667935246494bee (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_lblcr.c')
-rw-r--r--net/ipv4/ipvs/ip_vs_lblcr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/ipvs/ip_vs_lblcr.c b/net/ipv4/ipvs/ip_vs_lblcr.c
index 6225acac7a3b..6a1fec416eaf 100644
--- a/net/ipv4/ipvs/ip_vs_lblcr.c
+++ b/net/ipv4/ipvs/ip_vs_lblcr.c
@@ -50,6 +50,7 @@
50#include <linux/sysctl.h> 50#include <linux/sysctl.h>
51/* for proc_net_create/proc_net_remove */ 51/* for proc_net_create/proc_net_remove */
52#include <linux/proc_fs.h> 52#include <linux/proc_fs.h>
53#include <net/net_namespace.h>
53 54
54#include <net/ip_vs.h> 55#include <net/ip_vs.h>
55 56
@@ -843,7 +844,7 @@ static int __init ip_vs_lblcr_init(void)
843 INIT_LIST_HEAD(&ip_vs_lblcr_scheduler.n_list); 844 INIT_LIST_HEAD(&ip_vs_lblcr_scheduler.n_list);
844 sysctl_header = register_sysctl_table(lblcr_root_table); 845 sysctl_header = register_sysctl_table(lblcr_root_table);
845#ifdef CONFIG_IP_VS_LBLCR_DEBUG 846#ifdef CONFIG_IP_VS_LBLCR_DEBUG
846 proc_net_create("ip_vs_lblcr", 0, ip_vs_lblcr_getinfo); 847 proc_net_create(&init_net, "ip_vs_lblcr", 0, ip_vs_lblcr_getinfo);
847#endif 848#endif
848 return register_ip_vs_scheduler(&ip_vs_lblcr_scheduler); 849 return register_ip_vs_scheduler(&ip_vs_lblcr_scheduler);
849} 850}
@@ -852,7 +853,7 @@ static int __init ip_vs_lblcr_init(void)
852static void __exit ip_vs_lblcr_cleanup(void) 853static void __exit ip_vs_lblcr_cleanup(void)
853{ 854{
854#ifdef CONFIG_IP_VS_LBLCR_DEBUG 855#ifdef CONFIG_IP_VS_LBLCR_DEBUG
855 proc_net_remove("ip_vs_lblcr"); 856 proc_net_remove(&init_net, "ip_vs_lblcr");
856#endif 857#endif
857 unregister_sysctl_table(sysctl_header); 858 unregister_sysctl_table(sysctl_header);
858 unregister_ip_vs_scheduler(&ip_vs_lblcr_scheduler); 859 unregister_ip_vs_scheduler(&ip_vs_lblcr_scheduler);