[NET]: Make /proc/net per network namespace

[net-next-2.6.git] / net / ipv4 / fib_trie.c

diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 52b2891c63b7b6e28637369007a5758cc3bfe390..be34bd556d58ea5a041dc10de3d98201ead4eb03 100644 (file)
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -73,6 +73,7 @@
 #include <linux/netlink.h>
 #include <linux/init.h>
 #include <linux/list.h>
+#include <net/net_namespace.h>
 #include <net/ip.h>
 #include <net/protocol.h>
 #include <net/route.h>
@@ -2530,30 +2531,30 @@ static const struct file_operations fib_route_fops = {
 
 int __init fib_proc_init(void)
 {
-       if (!proc_net_fops_create("fib_trie", S_IRUGO, &fib_trie_fops))
+       if (!proc_net_fops_create(&init_net, "fib_trie", S_IRUGO, &fib_trie_fops))
                goto out1;
 
-       if (!proc_net_fops_create("fib_triestat", S_IRUGO, &fib_triestat_fops))
+       if (!proc_net_fops_create(&init_net, "fib_triestat", S_IRUGO, &fib_triestat_fops))
                goto out2;
 
-       if (!proc_net_fops_create("route", S_IRUGO, &fib_route_fops))
+       if (!proc_net_fops_create(&init_net, "route", S_IRUGO, &fib_route_fops))
                goto out3;
 
        return 0;
 
 out3:
-       proc_net_remove("fib_triestat");
+       proc_net_remove(&init_net, "fib_triestat");
 out2:
-       proc_net_remove("fib_trie");
+       proc_net_remove(&init_net, "fib_trie");
 out1:
        return -ENOMEM;
 }
 
 void __init fib_proc_exit(void)
 {
-       proc_net_remove("fib_trie");
-       proc_net_remove("fib_triestat");
-       proc_net_remove("route");
+       proc_net_remove(&init_net, "fib_trie");
+       proc_net_remove(&init_net, "fib_triestat");
+       proc_net_remove(&init_net, "route");
 }
 
 #endif /* CONFIG_PROC_FS */