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 /fs/proc/root.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 'fs/proc/root.c')
-rw-r--r-- | fs/proc/root.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index 41f17037f738..cf3046638b09 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c | |||
@@ -21,7 +21,7 @@ | |||
21 | 21 | ||
22 | #include "internal.h" | 22 | #include "internal.h" |
23 | 23 | ||
24 | struct proc_dir_entry *proc_net, *proc_net_stat, *proc_bus, *proc_root_fs, *proc_root_driver; | 24 | struct proc_dir_entry *proc_bus, *proc_root_fs, *proc_root_driver; |
25 | 25 | ||
26 | static int proc_get_sb(struct file_system_type *fs_type, | 26 | static int proc_get_sb(struct file_system_type *fs_type, |
27 | int flags, const char *dev_name, void *data, struct vfsmount *mnt) | 27 | int flags, const char *dev_name, void *data, struct vfsmount *mnt) |
@@ -61,8 +61,8 @@ void __init proc_root_init(void) | |||
61 | return; | 61 | return; |
62 | } | 62 | } |
63 | proc_misc_init(); | 63 | proc_misc_init(); |
64 | proc_net = proc_mkdir("net", NULL); | 64 | |
65 | proc_net_stat = proc_mkdir("net/stat", NULL); | 65 | proc_net_init(); |
66 | 66 | ||
67 | #ifdef CONFIG_SYSVIPC | 67 | #ifdef CONFIG_SYSVIPC |
68 | proc_mkdir("sysvipc", NULL); | 68 | proc_mkdir("sysvipc", NULL); |
@@ -159,7 +159,5 @@ EXPORT_SYMBOL(create_proc_entry); | |||
159 | EXPORT_SYMBOL(remove_proc_entry); | 159 | EXPORT_SYMBOL(remove_proc_entry); |
160 | EXPORT_SYMBOL(proc_root); | 160 | EXPORT_SYMBOL(proc_root); |
161 | EXPORT_SYMBOL(proc_root_fs); | 161 | EXPORT_SYMBOL(proc_root_fs); |
162 | EXPORT_SYMBOL(proc_net); | ||
163 | EXPORT_SYMBOL(proc_net_stat); | ||
164 | EXPORT_SYMBOL(proc_bus); | 162 | EXPORT_SYMBOL(proc_bus); |
165 | EXPORT_SYMBOL(proc_root_driver); | 163 | EXPORT_SYMBOL(proc_root_driver); |