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/appletalk | |
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/appletalk')
-rw-r--r-- | net/appletalk/atalk_proc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c index 87a582cc8111..05d9652afcb6 100644 --- a/net/appletalk/atalk_proc.c +++ b/net/appletalk/atalk_proc.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
12 | #include <linux/proc_fs.h> | 12 | #include <linux/proc_fs.h> |
13 | #include <linux/seq_file.h> | 13 | #include <linux/seq_file.h> |
14 | #include <net/net_namespace.h> | ||
14 | #include <net/sock.h> | 15 | #include <net/sock.h> |
15 | #include <linux/atalk.h> | 16 | #include <linux/atalk.h> |
16 | 17 | ||
@@ -271,7 +272,7 @@ int __init atalk_proc_init(void) | |||
271 | struct proc_dir_entry *p; | 272 | struct proc_dir_entry *p; |
272 | int rc = -ENOMEM; | 273 | int rc = -ENOMEM; |
273 | 274 | ||
274 | atalk_proc_dir = proc_mkdir("atalk", proc_net); | 275 | atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net); |
275 | if (!atalk_proc_dir) | 276 | if (!atalk_proc_dir) |
276 | goto out; | 277 | goto out; |
277 | atalk_proc_dir->owner = THIS_MODULE; | 278 | atalk_proc_dir->owner = THIS_MODULE; |
@@ -306,7 +307,7 @@ out_socket: | |||
306 | out_route: | 307 | out_route: |
307 | remove_proc_entry("interface", atalk_proc_dir); | 308 | remove_proc_entry("interface", atalk_proc_dir); |
308 | out_interface: | 309 | out_interface: |
309 | remove_proc_entry("atalk", proc_net); | 310 | remove_proc_entry("atalk", init_net.proc_net); |
310 | goto out; | 311 | goto out; |
311 | } | 312 | } |
312 | 313 | ||
@@ -316,5 +317,5 @@ void __exit atalk_proc_exit(void) | |||
316 | remove_proc_entry("route", atalk_proc_dir); | 317 | remove_proc_entry("route", atalk_proc_dir); |
317 | remove_proc_entry("socket", atalk_proc_dir); | 318 | remove_proc_entry("socket", atalk_proc_dir); |
318 | remove_proc_entry("arp", atalk_proc_dir); | 319 | remove_proc_entry("arp", atalk_proc_dir); |
319 | remove_proc_entry("atalk", proc_net); | 320 | remove_proc_entry("atalk", init_net.proc_net); |
320 | } | 321 | } |