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/tcp_ipv4.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/tcp_ipv4.c')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index e089a978e128..8855e640e958 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -62,6 +62,7 @@ | |||
62 | #include <linux/init.h> | 62 | #include <linux/init.h> |
63 | #include <linux/times.h> | 63 | #include <linux/times.h> |
64 | 64 | ||
65 | #include <net/net_namespace.h> | ||
65 | #include <net/icmp.h> | 66 | #include <net/icmp.h> |
66 | #include <net/inet_hashtables.h> | 67 | #include <net/inet_hashtables.h> |
67 | #include <net/tcp.h> | 68 | #include <net/tcp.h> |
@@ -2249,7 +2250,7 @@ int tcp_proc_register(struct tcp_seq_afinfo *afinfo) | |||
2249 | afinfo->seq_fops->llseek = seq_lseek; | 2250 | afinfo->seq_fops->llseek = seq_lseek; |
2250 | afinfo->seq_fops->release = seq_release_private; | 2251 | afinfo->seq_fops->release = seq_release_private; |
2251 | 2252 | ||
2252 | p = proc_net_fops_create(afinfo->name, S_IRUGO, afinfo->seq_fops); | 2253 | p = proc_net_fops_create(&init_net, afinfo->name, S_IRUGO, afinfo->seq_fops); |
2253 | if (p) | 2254 | if (p) |
2254 | p->data = afinfo; | 2255 | p->data = afinfo; |
2255 | else | 2256 | else |
@@ -2261,7 +2262,7 @@ void tcp_proc_unregister(struct tcp_seq_afinfo *afinfo) | |||
2261 | { | 2262 | { |
2262 | if (!afinfo) | 2263 | if (!afinfo) |
2263 | return; | 2264 | return; |
2264 | proc_net_remove(afinfo->name); | 2265 | proc_net_remove(&init_net, afinfo->name); |
2265 | memset(afinfo->seq_fops, 0, sizeof(*afinfo->seq_fops)); | 2266 | memset(afinfo->seq_fops, 0, sizeof(*afinfo->seq_fops)); |
2266 | } | 2267 | } |
2267 | 2268 | ||