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/net/ibmveth.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/net/ibmveth.c')
-rw-r--r-- | drivers/net/ibmveth.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index 78e28ada1e21..0c35d72f5f8d 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c | |||
@@ -47,6 +47,7 @@ | |||
47 | #include <linux/mm.h> | 47 | #include <linux/mm.h> |
48 | #include <linux/ethtool.h> | 48 | #include <linux/ethtool.h> |
49 | #include <linux/proc_fs.h> | 49 | #include <linux/proc_fs.h> |
50 | #include <net/net_namespace.h> | ||
50 | #include <asm/semaphore.h> | 51 | #include <asm/semaphore.h> |
51 | #include <asm/hvcall.h> | 52 | #include <asm/hvcall.h> |
52 | #include <asm/atomic.h> | 53 | #include <asm/atomic.h> |
@@ -97,7 +98,7 @@ static void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter); | |||
97 | static struct kobj_type ktype_veth_pool; | 98 | static struct kobj_type ktype_veth_pool; |
98 | 99 | ||
99 | #ifdef CONFIG_PROC_FS | 100 | #ifdef CONFIG_PROC_FS |
100 | #define IBMVETH_PROC_DIR "net/ibmveth" | 101 | #define IBMVETH_PROC_DIR "ibmveth" |
101 | static struct proc_dir_entry *ibmveth_proc_dir; | 102 | static struct proc_dir_entry *ibmveth_proc_dir; |
102 | #endif | 103 | #endif |
103 | 104 | ||
@@ -1091,7 +1092,7 @@ static int __devexit ibmveth_remove(struct vio_dev *dev) | |||
1091 | #ifdef CONFIG_PROC_FS | 1092 | #ifdef CONFIG_PROC_FS |
1092 | static void ibmveth_proc_register_driver(void) | 1093 | static void ibmveth_proc_register_driver(void) |
1093 | { | 1094 | { |
1094 | ibmveth_proc_dir = proc_mkdir(IBMVETH_PROC_DIR, NULL); | 1095 | ibmveth_proc_dir = proc_mkdir(IBMVETH_PROC_DIR, init_net.proc_net); |
1095 | if (ibmveth_proc_dir) { | 1096 | if (ibmveth_proc_dir) { |
1096 | SET_MODULE_OWNER(ibmveth_proc_dir); | 1097 | SET_MODULE_OWNER(ibmveth_proc_dir); |
1097 | } | 1098 | } |
@@ -1099,7 +1100,7 @@ static void ibmveth_proc_register_driver(void) | |||
1099 | 1100 | ||
1100 | static void ibmveth_proc_unregister_driver(void) | 1101 | static void ibmveth_proc_unregister_driver(void) |
1101 | { | 1102 | { |
1102 | remove_proc_entry(IBMVETH_PROC_DIR, NULL); | 1103 | remove_proc_entry(IBMVETH_PROC_DIR, init_net.proc_net); |
1103 | } | 1104 | } |
1104 | 1105 | ||
1105 | static void *ibmveth_seq_start(struct seq_file *seq, loff_t *pos) | 1106 | static void *ibmveth_seq_start(struct seq_file *seq, loff_t *pos) |