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/arp.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/arp.c')
-rw-r--r-- | net/ipv4/arp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index 9ab9d534fbac..78dd3443016c 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c | |||
@@ -103,6 +103,7 @@ | |||
103 | #include <linux/sysctl.h> | 103 | #include <linux/sysctl.h> |
104 | #endif | 104 | #endif |
105 | 105 | ||
106 | #include <net/net_namespace.h> | ||
106 | #include <net/ip.h> | 107 | #include <net/ip.h> |
107 | #include <net/icmp.h> | 108 | #include <net/icmp.h> |
108 | #include <net/route.h> | 109 | #include <net/route.h> |
@@ -1400,7 +1401,7 @@ static const struct file_operations arp_seq_fops = { | |||
1400 | 1401 | ||
1401 | static int __init arp_proc_init(void) | 1402 | static int __init arp_proc_init(void) |
1402 | { | 1403 | { |
1403 | if (!proc_net_fops_create("arp", S_IRUGO, &arp_seq_fops)) | 1404 | if (!proc_net_fops_create(&init_net, "arp", S_IRUGO, &arp_seq_fops)) |
1404 | return -ENOMEM; | 1405 | return -ENOMEM; |
1405 | return 0; | 1406 | return 0; |
1406 | } | 1407 | } |