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/hardware | |
| 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/hardware')
| -rw-r--r-- | drivers/isdn/hardware/eicon/diva_didd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/isdn/hardware/eicon/diva_didd.c b/drivers/isdn/hardware/eicon/diva_didd.c index d755d904e6..993b14cf17 100644 --- a/drivers/isdn/hardware/eicon/diva_didd.c +++ b/drivers/isdn/hardware/eicon/diva_didd.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/proc_fs.h> | 17 | #include <linux/proc_fs.h> |
| 18 | #include <net/net_namespace.h> | ||
| 18 | 19 | ||
| 19 | #include "platform.h" | 20 | #include "platform.h" |
| 20 | #include "di_defs.h" | 21 | #include "di_defs.h" |
| @@ -86,7 +87,7 @@ proc_read(char *page, char **start, off_t off, int count, int *eof, | |||
| 86 | 87 | ||
| 87 | static int DIVA_INIT_FUNCTION create_proc(void) | 88 | static int DIVA_INIT_FUNCTION create_proc(void) |
| 88 | { | 89 | { |
| 89 | proc_net_eicon = proc_mkdir("net/eicon", NULL); | 90 | proc_net_eicon = proc_mkdir("eicon", init_net.proc_net); |
| 90 | 91 | ||
| 91 | if (proc_net_eicon) { | 92 | if (proc_net_eicon) { |
| 92 | if ((proc_didd = | 93 | if ((proc_didd = |
| @@ -102,7 +103,7 @@ static int DIVA_INIT_FUNCTION create_proc(void) | |||
| 102 | static void remove_proc(void) | 103 | static void remove_proc(void) |
| 103 | { | 104 | { |
| 104 | remove_proc_entry(DRIVERLNAME, proc_net_eicon); | 105 | remove_proc_entry(DRIVERLNAME, proc_net_eicon); |
| 105 | remove_proc_entry("net/eicon", NULL); | 106 | remove_proc_entry("eicon", init_net.proc_net); |
| 106 | } | 107 | } |
| 107 | 108 | ||
| 108 | static int DIVA_INIT_FUNCTION divadidd_init(void) | 109 | static int DIVA_INIT_FUNCTION divadidd_init(void) |
