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 /net/llc | |
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 'net/llc')
-rw-r--r-- | net/llc/llc_proc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c index 49be6c902c83..4865d82896b1 100644 --- a/net/llc/llc_proc.c +++ b/net/llc/llc_proc.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/proc_fs.h> | 17 | #include <linux/proc_fs.h> |
18 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
19 | #include <linux/seq_file.h> | 19 | #include <linux/seq_file.h> |
20 | #include <net/net_namespace.h> | ||
20 | #include <net/sock.h> | 21 | #include <net/sock.h> |
21 | #include <net/llc.h> | 22 | #include <net/llc.h> |
22 | #include <net/llc_c_ac.h> | 23 | #include <net/llc_c_ac.h> |
@@ -231,7 +232,7 @@ int __init llc_proc_init(void) | |||
231 | int rc = -ENOMEM; | 232 | int rc = -ENOMEM; |
232 | struct proc_dir_entry *p; | 233 | struct proc_dir_entry *p; |
233 | 234 | ||
234 | llc_proc_dir = proc_mkdir("llc", proc_net); | 235 | llc_proc_dir = proc_mkdir("llc", init_net.proc_net); |
235 | if (!llc_proc_dir) | 236 | if (!llc_proc_dir) |
236 | goto out; | 237 | goto out; |
237 | llc_proc_dir->owner = THIS_MODULE; | 238 | llc_proc_dir->owner = THIS_MODULE; |
@@ -254,7 +255,7 @@ out: | |||
254 | out_core: | 255 | out_core: |
255 | remove_proc_entry("socket", llc_proc_dir); | 256 | remove_proc_entry("socket", llc_proc_dir); |
256 | out_socket: | 257 | out_socket: |
257 | remove_proc_entry("llc", proc_net); | 258 | remove_proc_entry("llc", init_net.proc_net); |
258 | goto out; | 259 | goto out; |
259 | } | 260 | } |
260 | 261 | ||
@@ -262,5 +263,5 @@ void llc_proc_exit(void) | |||
262 | { | 263 | { |
263 | remove_proc_entry("socket", llc_proc_dir); | 264 | remove_proc_entry("socket", llc_proc_dir); |
264 | remove_proc_entry("core", llc_proc_dir); | 265 | remove_proc_entry("core", llc_proc_dir); |
265 | remove_proc_entry("llc", proc_net); | 266 | remove_proc_entry("llc", init_net.proc_net); |
266 | } | 267 | } |