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/ipv4/udp.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/ipv4/udp.c')
-rw-r--r-- | net/ipv4/udp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index a581b543bff7..ef4d901ee9ad 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
@@ -98,6 +98,7 @@ | |||
98 | #include <linux/skbuff.h> | 98 | #include <linux/skbuff.h> |
99 | #include <linux/proc_fs.h> | 99 | #include <linux/proc_fs.h> |
100 | #include <linux/seq_file.h> | 100 | #include <linux/seq_file.h> |
101 | #include <net/net_namespace.h> | ||
101 | #include <net/icmp.h> | 102 | #include <net/icmp.h> |
102 | #include <net/route.h> | 103 | #include <net/route.h> |
103 | #include <net/checksum.h> | 104 | #include <net/checksum.h> |
@@ -1566,7 +1567,7 @@ int udp_proc_register(struct udp_seq_afinfo *afinfo) | |||
1566 | afinfo->seq_fops->llseek = seq_lseek; | 1567 | afinfo->seq_fops->llseek = seq_lseek; |
1567 | afinfo->seq_fops->release = seq_release_private; | 1568 | afinfo->seq_fops->release = seq_release_private; |
1568 | 1569 | ||
1569 | p = proc_net_fops_create(afinfo->name, S_IRUGO, afinfo->seq_fops); | 1570 | p = proc_net_fops_create(&init_net, afinfo->name, S_IRUGO, afinfo->seq_fops); |
1570 | if (p) | 1571 | if (p) |
1571 | p->data = afinfo; | 1572 | p->data = afinfo; |
1572 | else | 1573 | else |
@@ -1578,7 +1579,7 @@ void udp_proc_unregister(struct udp_seq_afinfo *afinfo) | |||
1578 | { | 1579 | { |
1579 | if (!afinfo) | 1580 | if (!afinfo) |
1580 | return; | 1581 | return; |
1581 | proc_net_remove(afinfo->name); | 1582 | proc_net_remove(&init_net, afinfo->name); |
1582 | memset(afinfo->seq_fops, 0, sizeof(*afinfo->seq_fops)); | 1583 | memset(afinfo->seq_fops, 0, sizeof(*afinfo->seq_fops)); |
1583 | } | 1584 | } |
1584 | 1585 | ||