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 /drivers/net/hamradio/yam.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 'drivers/net/hamradio/yam.c')
-rw-r--r-- | drivers/net/hamradio/yam.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index 467559debfd6..401724ddafcd 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c | |||
@@ -65,6 +65,7 @@ | |||
65 | #include <linux/kernel.h> | 65 | #include <linux/kernel.h> |
66 | #include <linux/proc_fs.h> | 66 | #include <linux/proc_fs.h> |
67 | #include <linux/seq_file.h> | 67 | #include <linux/seq_file.h> |
68 | #include <net/net_namespace.h> | ||
68 | 69 | ||
69 | #include <asm/uaccess.h> | 70 | #include <asm/uaccess.h> |
70 | #include <linux/init.h> | 71 | #include <linux/init.h> |
@@ -1142,7 +1143,7 @@ static int __init yam_init_driver(void) | |||
1142 | yam_timer.expires = jiffies + HZ / 100; | 1143 | yam_timer.expires = jiffies + HZ / 100; |
1143 | add_timer(&yam_timer); | 1144 | add_timer(&yam_timer); |
1144 | 1145 | ||
1145 | proc_net_fops_create("yam", S_IRUGO, &yam_info_fops); | 1146 | proc_net_fops_create(&init_net, "yam", S_IRUGO, &yam_info_fops); |
1146 | return 0; | 1147 | return 0; |
1147 | error: | 1148 | error: |
1148 | while (--i >= 0) { | 1149 | while (--i >= 0) { |
@@ -1174,7 +1175,7 @@ static void __exit yam_cleanup_driver(void) | |||
1174 | kfree(p); | 1175 | kfree(p); |
1175 | } | 1176 | } |
1176 | 1177 | ||
1177 | proc_net_remove("yam"); | 1178 | proc_net_remove(&init_net, "yam"); |
1178 | } | 1179 | } |
1179 | 1180 | ||
1180 | /* --------------------------------------------------------------------- */ | 1181 | /* --------------------------------------------------------------------- */ |