aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/raw.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-09-12 06:01:34 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:49:06 -0400
commit457c4cbc5a3dde259d2a1f15d5f9785290397267 (patch)
treea2ceee88780cbce27433b9a4434b3e9251efd81a /net/ipv4/raw.c
parent07feaebfcc10cd35e745c7073667935246494bee (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/raw.c')
-rw-r--r--net/ipv4/raw.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index c6d71526f625..216e01b0f44a 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -59,6 +59,7 @@
59#include <linux/in_route.h> 59#include <linux/in_route.h>
60#include <linux/route.h> 60#include <linux/route.h>
61#include <linux/skbuff.h> 61#include <linux/skbuff.h>
62#include <net/net_namespace.h>
62#include <net/dst.h> 63#include <net/dst.h>
63#include <net/sock.h> 64#include <net/sock.h>
64#include <linux/gfp.h> 65#include <linux/gfp.h>
@@ -928,13 +929,13 @@ static const struct file_operations raw_seq_fops = {
928 929
929int __init raw_proc_init(void) 930int __init raw_proc_init(void)
930{ 931{
931 if (!proc_net_fops_create("raw", S_IRUGO, &raw_seq_fops)) 932 if (!proc_net_fops_create(&init_net, "raw", S_IRUGO, &raw_seq_fops))
932 return -ENOMEM; 933 return -ENOMEM;
933 return 0; 934 return 0;
934} 935}
935 936
936void __init raw_proc_exit(void) 937void __init raw_proc_exit(void)
937{ 938{
938 proc_net_remove("raw"); 939 proc_net_remove(&init_net, "raw");
939} 940}
940#endif /* CONFIG_PROC_FS */ 941#endif /* CONFIG_PROC_FS */