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 /include/net | |
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 'include/net')
-rw-r--r-- | include/net/net_namespace.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 6344b77f81a2..547247681345 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h | |||
@@ -8,6 +8,7 @@ | |||
8 | #include <linux/workqueue.h> | 8 | #include <linux/workqueue.h> |
9 | #include <linux/list.h> | 9 | #include <linux/list.h> |
10 | 10 | ||
11 | struct proc_dir_entry; | ||
11 | struct net { | 12 | struct net { |
12 | atomic_t count; /* To decided when the network | 13 | atomic_t count; /* To decided when the network |
13 | * namespace should be freed. | 14 | * namespace should be freed. |
@@ -17,6 +18,10 @@ struct net { | |||
17 | */ | 18 | */ |
18 | struct list_head list; /* list of network namespaces */ | 19 | struct list_head list; /* list of network namespaces */ |
19 | struct work_struct work; /* work struct for freeing */ | 20 | struct work_struct work; /* work struct for freeing */ |
21 | |||
22 | struct proc_dir_entry *proc_net; | ||
23 | struct proc_dir_entry *proc_net_stat; | ||
24 | struct proc_dir_entry *proc_net_root; | ||
20 | }; | 25 | }; |
21 | 26 | ||
22 | extern struct net init_net; | 27 | extern struct net init_net; |