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/isdn/divert | |
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/isdn/divert')
-rw-r--r-- | drivers/isdn/divert/divert_procfs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/isdn/divert/divert_procfs.c b/drivers/isdn/divert/divert_procfs.c index 559a0d0244cf..4fd4c46892e3 100644 --- a/drivers/isdn/divert/divert_procfs.c +++ b/drivers/isdn/divert/divert_procfs.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/fs.h> | 17 | #include <linux/fs.h> |
18 | #endif | 18 | #endif |
19 | #include <linux/isdnif.h> | 19 | #include <linux/isdnif.h> |
20 | #include <net/net_namespace.h> | ||
20 | #include "isdn_divert.h" | 21 | #include "isdn_divert.h" |
21 | 22 | ||
22 | 23 | ||
@@ -284,12 +285,12 @@ divert_dev_init(void) | |||
284 | init_waitqueue_head(&rd_queue); | 285 | init_waitqueue_head(&rd_queue); |
285 | 286 | ||
286 | #ifdef CONFIG_PROC_FS | 287 | #ifdef CONFIG_PROC_FS |
287 | isdn_proc_entry = proc_mkdir("net/isdn", NULL); | 288 | isdn_proc_entry = proc_mkdir("isdn", init_net.proc_net); |
288 | if (!isdn_proc_entry) | 289 | if (!isdn_proc_entry) |
289 | return (-1); | 290 | return (-1); |
290 | isdn_divert_entry = create_proc_entry("divert", S_IFREG | S_IRUGO, isdn_proc_entry); | 291 | isdn_divert_entry = create_proc_entry("divert", S_IFREG | S_IRUGO, isdn_proc_entry); |
291 | if (!isdn_divert_entry) { | 292 | if (!isdn_divert_entry) { |
292 | remove_proc_entry("net/isdn", NULL); | 293 | remove_proc_entry("isdn", init_net.proc_net); |
293 | return (-1); | 294 | return (-1); |
294 | } | 295 | } |
295 | isdn_divert_entry->proc_fops = &isdn_fops; | 296 | isdn_divert_entry->proc_fops = &isdn_fops; |
@@ -309,7 +310,7 @@ divert_dev_deinit(void) | |||
309 | 310 | ||
310 | #ifdef CONFIG_PROC_FS | 311 | #ifdef CONFIG_PROC_FS |
311 | remove_proc_entry("divert", isdn_proc_entry); | 312 | remove_proc_entry("divert", isdn_proc_entry); |
312 | remove_proc_entry("net/isdn", NULL); | 313 | remove_proc_entry("isdn", init_net.proc_net); |
313 | #endif /* CONFIG_PROC_FS */ | 314 | #endif /* CONFIG_PROC_FS */ |
314 | 315 | ||
315 | return (0); | 316 | return (0); |