aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ipvs/ip_vs_conn.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_conn.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_conn.c')
-rw-r--r--net/ipv4/ipvs/ip_vs_conn.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c
index d612a6a5d957..4b702f708d30 100644
--- a/net/ipv4/ipvs/ip_vs_conn.c
+++ b/net/ipv4/ipvs/ip_vs_conn.c
@@ -35,6 +35,7 @@
35#include <linux/jhash.h> 35#include <linux/jhash.h>
36#include <linux/random.h> 36#include <linux/random.h>
37 37
38#include <net/net_namespace.h>
38#include <net/ip_vs.h> 39#include <net/ip_vs.h>
39 40
40 41
@@ -922,7 +923,7 @@ int ip_vs_conn_init(void)
922 rwlock_init(&__ip_vs_conntbl_lock_array[idx].l); 923 rwlock_init(&__ip_vs_conntbl_lock_array[idx].l);
923 } 924 }
924 925
925 proc_net_fops_create("ip_vs_conn", 0, &ip_vs_conn_fops); 926 proc_net_fops_create(&init_net, "ip_vs_conn", 0, &ip_vs_conn_fops);
926 927
927 /* calculate the random value for connection hash */ 928 /* calculate the random value for connection hash */
928 get_random_bytes(&ip_vs_conn_rnd, sizeof(ip_vs_conn_rnd)); 929 get_random_bytes(&ip_vs_conn_rnd, sizeof(ip_vs_conn_rnd));
@@ -938,6 +939,6 @@ void ip_vs_conn_cleanup(void)
938 939
939 /* Release the empty cache */ 940 /* Release the empty cache */
940 kmem_cache_destroy(ip_vs_conn_cachep); 941 kmem_cache_destroy(ip_vs_conn_cachep);
941 proc_net_remove("ip_vs_conn"); 942 proc_net_remove(&init_net, "ip_vs_conn");
942 vfree(ip_vs_conn_tab); 943 vfree(ip_vs_conn_tab);
943} 944}