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/ipv6/raw.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/ipv6/raw.c')
-rw-r--r-- | net/ipv6/raw.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 77167afa3455..38a3d21c2585 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <asm/uaccess.h> | 35 | #include <asm/uaccess.h> |
36 | #include <asm/ioctls.h> | 36 | #include <asm/ioctls.h> |
37 | 37 | ||
38 | #include <net/net_namespace.h> | ||
38 | #include <net/ip.h> | 39 | #include <net/ip.h> |
39 | #include <net/sock.h> | 40 | #include <net/sock.h> |
40 | #include <net/snmp.h> | 41 | #include <net/snmp.h> |
@@ -1315,13 +1316,13 @@ static const struct file_operations raw6_seq_fops = { | |||
1315 | 1316 | ||
1316 | int __init raw6_proc_init(void) | 1317 | int __init raw6_proc_init(void) |
1317 | { | 1318 | { |
1318 | if (!proc_net_fops_create("raw6", S_IRUGO, &raw6_seq_fops)) | 1319 | if (!proc_net_fops_create(&init_net, "raw6", S_IRUGO, &raw6_seq_fops)) |
1319 | return -ENOMEM; | 1320 | return -ENOMEM; |
1320 | return 0; | 1321 | return 0; |
1321 | } | 1322 | } |
1322 | 1323 | ||
1323 | void raw6_proc_exit(void) | 1324 | void raw6_proc_exit(void) |
1324 | { | 1325 | { |
1325 | proc_net_remove("raw6"); | 1326 | proc_net_remove(&init_net, "raw6"); |
1326 | } | 1327 | } |
1327 | #endif /* CONFIG_PROC_FS */ | 1328 | #endif /* CONFIG_PROC_FS */ |