[NETNS]: Add namespace to API for routing /proc entries creation.

This adds netns parameter to fib_proc_init/exit and replaces __init
specifier with __net_init. After this, we will not yet have these proc
files show info from the specific namespace - this will be done when
these tables become namespaced.

Acked-by: Benjamin Thery <benjamin.thery@bull.net>
Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 17 insertions, 16 deletions

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 0e12cf646071..d5b8cb1dad67 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1475,14 +1475,14 @@ static int __init ipv4_proc_init(void)
                 goto out_tcp;
         if (udp4_proc_init())
                 goto out_udp;
-        if (fib_proc_init())
+        if (fib_proc_init(&init_net))
                 goto out_fib;
         if (ip_misc_proc_init())
                 goto out_misc;
 out:
         return rc;
 out_misc:
-        fib_proc_exit();
+        fib_proc_exit(&init_net);
 out_fib:
         udp4_proc_exit();
 out_udp:
diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c
index ee1ffdb3044f..8de21bc4947a 100644
--- a/net/ipv4/fib_hash.c
+++ b/net/ipv4/fib_hash.c
@@ -1041,15 +1041,15 @@ static const struct file_operations fib_seq_fops = {
         .release        = seq_release_private,
 };
 
-int __init fib_proc_init(void)
+int __net_init fib_proc_init(struct net *net)
 {
-        if (!proc_net_fops_create(&init_net, "route", S_IRUGO, &fib_seq_fops))
+        if (!proc_net_fops_create(net, "route", S_IRUGO, &fib_seq_fops))
                 return -ENOMEM;
         return 0;
 }
 
-void __init fib_proc_exit(void)
+void __net_exit fib_proc_exit(struct net *net)
 {
-        proc_net_remove(&init_net, "route");
+        proc_net_remove(net, "route");
 }
 #endif /* CONFIG_PROC_FS */
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index a842204df7ba..4bbfaeedf210 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -2508,32 +2508,33 @@ static const struct file_operations fib_route_fops = {
         .release = seq_release_private,
 };
 
-int __init fib_proc_init(void)
+int __net_init fib_proc_init(struct net *net)
 {
-        if (!proc_net_fops_create(&init_net, "fib_trie", S_IRUGO, &fib_trie_fops))
+        if (!proc_net_fops_create(net, "fib_trie", S_IRUGO, &fib_trie_fops))
                 goto out1;
 
-        if (!proc_net_fops_create(&init_net, "fib_triestat", S_IRUGO, &fib_triestat_fops))
+        if (!proc_net_fops_create(net, "fib_triestat", S_IRUGO,
+                                  &fib_triestat_fops))
                 goto out2;
 
-        if (!proc_net_fops_create(&init_net, "route", S_IRUGO, &fib_route_fops))
+        if (!proc_net_fops_create(net, "route", S_IRUGO, &fib_route_fops))
                 goto out3;
 
         return 0;
 
 out3:
-        proc_net_remove(&init_net, "fib_triestat");
+        proc_net_remove(net, "fib_triestat");
 out2:
-        proc_net_remove(&init_net, "fib_trie");
+        proc_net_remove(net, "fib_trie");
 out1:
         return -ENOMEM;
 }
 
-void __init fib_proc_exit(void)
+void __net_exit fib_proc_exit(struct net *net)
 {
-        proc_net_remove(&init_net, "fib_trie");
-        proc_net_remove(&init_net, "fib_triestat");
-        proc_net_remove(&init_net, "route");
+        proc_net_remove(net, "fib_trie");
+        proc_net_remove(net, "fib_triestat");
+        proc_net_remove(net, "route");
 }
 
 #endif /* CONFIG_PROC_FS */