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/bonding/bond_main.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/bonding/bond_main.c')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 1afda3230def..5de648f90a45 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -75,6 +75,7 @@ | |||
75 | #include <linux/if_vlan.h> | 75 | #include <linux/if_vlan.h> |
76 | #include <linux/if_bonding.h> | 76 | #include <linux/if_bonding.h> |
77 | #include <net/route.h> | 77 | #include <net/route.h> |
78 | #include <net/net_namespace.h> | ||
78 | #include "bonding.h" | 79 | #include "bonding.h" |
79 | #include "bond_3ad.h" | 80 | #include "bond_3ad.h" |
80 | #include "bond_alb.h" | 81 | #include "bond_alb.h" |
@@ -3144,7 +3145,7 @@ static void bond_create_proc_dir(void) | |||
3144 | { | 3145 | { |
3145 | int len = strlen(DRV_NAME); | 3146 | int len = strlen(DRV_NAME); |
3146 | 3147 | ||
3147 | for (bond_proc_dir = proc_net->subdir; bond_proc_dir; | 3148 | for (bond_proc_dir = init_net.proc_net->subdir; bond_proc_dir; |
3148 | bond_proc_dir = bond_proc_dir->next) { | 3149 | bond_proc_dir = bond_proc_dir->next) { |
3149 | if ((bond_proc_dir->namelen == len) && | 3150 | if ((bond_proc_dir->namelen == len) && |
3150 | !memcmp(bond_proc_dir->name, DRV_NAME, len)) { | 3151 | !memcmp(bond_proc_dir->name, DRV_NAME, len)) { |
@@ -3153,7 +3154,7 @@ static void bond_create_proc_dir(void) | |||
3153 | } | 3154 | } |
3154 | 3155 | ||
3155 | if (!bond_proc_dir) { | 3156 | if (!bond_proc_dir) { |
3156 | bond_proc_dir = proc_mkdir(DRV_NAME, proc_net); | 3157 | bond_proc_dir = proc_mkdir(DRV_NAME, init_net.proc_net); |
3157 | if (bond_proc_dir) { | 3158 | if (bond_proc_dir) { |
3158 | bond_proc_dir->owner = THIS_MODULE; | 3159 | bond_proc_dir->owner = THIS_MODULE; |
3159 | } else { | 3160 | } else { |
@@ -3188,7 +3189,7 @@ static void bond_destroy_proc_dir(void) | |||
3188 | bond_proc_dir->owner = NULL; | 3189 | bond_proc_dir->owner = NULL; |
3189 | } | 3190 | } |
3190 | } else { | 3191 | } else { |
3191 | remove_proc_entry(DRV_NAME, proc_net); | 3192 | remove_proc_entry(DRV_NAME, init_net.proc_net); |
3192 | bond_proc_dir = NULL; | 3193 | bond_proc_dir = NULL; |
3193 | } | 3194 | } |
3194 | } | 3195 | } |