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/hysdn/hysdn_procconf.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/isdn/hysdn/hysdn_procconf.c')
-rw-r--r-- | drivers/isdn/hysdn/hysdn_procconf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/isdn/hysdn/hysdn_procconf.c b/drivers/isdn/hysdn/hysdn_procconf.c index dc477e0aab0e..27d890b48f88 100644 --- a/drivers/isdn/hysdn/hysdn_procconf.c +++ b/drivers/isdn/hysdn/hysdn_procconf.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/proc_fs.h> | 16 | #include <linux/proc_fs.h> |
17 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
18 | #include <linux/smp_lock.h> | 18 | #include <linux/smp_lock.h> |
19 | #include <net/net_namespace.h> | ||
19 | 20 | ||
20 | #include "hysdn_defs.h" | 21 | #include "hysdn_defs.h" |
21 | 22 | ||
@@ -392,7 +393,7 @@ hysdn_procconf_init(void) | |||
392 | hysdn_card *card; | 393 | hysdn_card *card; |
393 | unsigned char conf_name[20]; | 394 | unsigned char conf_name[20]; |
394 | 395 | ||
395 | hysdn_proc_entry = proc_mkdir(PROC_SUBDIR_NAME, proc_net); | 396 | hysdn_proc_entry = proc_mkdir(PROC_SUBDIR_NAME, init_net.proc_net); |
396 | if (!hysdn_proc_entry) { | 397 | if (!hysdn_proc_entry) { |
397 | printk(KERN_ERR "HYSDN: unable to create hysdn subdir\n"); | 398 | printk(KERN_ERR "HYSDN: unable to create hysdn subdir\n"); |
398 | return (-1); | 399 | return (-1); |
@@ -437,5 +438,5 @@ hysdn_procconf_release(void) | |||
437 | card = card->next; /* point to next card */ | 438 | card = card->next; /* point to next card */ |
438 | } | 439 | } |
439 | 440 | ||
440 | remove_proc_entry(PROC_SUBDIR_NAME, proc_net); | 441 | remove_proc_entry(PROC_SUBDIR_NAME, init_net.proc_net); |
441 | } | 442 | } |