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/fib_hash.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/fib_hash.c')
-rw-r--r-- | net/ipv4/fib_hash.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c index 9ad1d9ff9ce7..9fafbeea8fe6 100644 --- a/net/ipv4/fib_hash.c +++ b/net/ipv4/fib_hash.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <linux/netlink.h> | 35 | #include <linux/netlink.h> |
36 | #include <linux/init.h> | 36 | #include <linux/init.h> |
37 | 37 | ||
38 | #include <net/net_namespace.h> | ||
38 | #include <net/ip.h> | 39 | #include <net/ip.h> |
39 | #include <net/protocol.h> | 40 | #include <net/protocol.h> |
40 | #include <net/route.h> | 41 | #include <net/route.h> |
@@ -1068,13 +1069,13 @@ static const struct file_operations fib_seq_fops = { | |||
1068 | 1069 | ||
1069 | int __init fib_proc_init(void) | 1070 | int __init fib_proc_init(void) |
1070 | { | 1071 | { |
1071 | if (!proc_net_fops_create("route", S_IRUGO, &fib_seq_fops)) | 1072 | if (!proc_net_fops_create(&init_net, "route", S_IRUGO, &fib_seq_fops)) |
1072 | return -ENOMEM; | 1073 | return -ENOMEM; |
1073 | return 0; | 1074 | return 0; |
1074 | } | 1075 | } |
1075 | 1076 | ||
1076 | void __init fib_proc_exit(void) | 1077 | void __init fib_proc_exit(void) |
1077 | { | 1078 | { |
1078 | proc_net_remove("route"); | 1079 | proc_net_remove(&init_net, "route"); |
1079 | } | 1080 | } |
1080 | #endif /* CONFIG_PROC_FS */ | 1081 | #endif /* CONFIG_PROC_FS */ |