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/sctp/protocol.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 'net/sctp/protocol.c')
-rw-r--r-- | net/sctp/protocol.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 957c118a6068..30929e3ca05a 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c | |||
@@ -52,6 +52,7 @@ | |||
52 | #include <linux/inetdevice.h> | 52 | #include <linux/inetdevice.h> |
53 | #include <linux/seq_file.h> | 53 | #include <linux/seq_file.h> |
54 | #include <linux/bootmem.h> | 54 | #include <linux/bootmem.h> |
55 | #include <net/net_namespace.h> | ||
55 | #include <net/protocol.h> | 56 | #include <net/protocol.h> |
56 | #include <net/ip.h> | 57 | #include <net/ip.h> |
57 | #include <net/ipv6.h> | 58 | #include <net/ipv6.h> |
@@ -98,7 +99,7 @@ static __init int sctp_proc_init(void) | |||
98 | { | 99 | { |
99 | if (!proc_net_sctp) { | 100 | if (!proc_net_sctp) { |
100 | struct proc_dir_entry *ent; | 101 | struct proc_dir_entry *ent; |
101 | ent = proc_mkdir("net/sctp", NULL); | 102 | ent = proc_mkdir("sctp", init_net.proc_net); |
102 | if (ent) { | 103 | if (ent) { |
103 | ent->owner = THIS_MODULE; | 104 | ent->owner = THIS_MODULE; |
104 | proc_net_sctp = ent; | 105 | proc_net_sctp = ent; |
@@ -131,7 +132,7 @@ static void sctp_proc_exit(void) | |||
131 | 132 | ||
132 | if (proc_net_sctp) { | 133 | if (proc_net_sctp) { |
133 | proc_net_sctp = NULL; | 134 | proc_net_sctp = NULL; |
134 | remove_proc_entry("net/sctp", NULL); | 135 | remove_proc_entry("sctp", init_net.proc_net); |
135 | } | 136 | } |
136 | } | 137 | } |
137 | 138 | ||