4 files changed, 12 insertions, 8 deletions

diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index ed76d4aab4a9..625d5955b8e2 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -128,6 +128,7 @@ Version 0.0.6    2.1.110   07-aug-98   Eduardo Marcelo Serrat
 #include <linux/stat.h>
 #include <linux/init.h>
 #include <linux/poll.h>
+#include <net/net_namespace.h>
 #include <net/neighbour.h>
 #include <net/dst.h>
 #include <net/fib_rules.h>
@@ -2399,7 +2400,7 @@ static int __init decnet_init(void)
         dev_add_pack(&dn_dix_packet_type);
         register_netdevice_notifier(&dn_dev_notifier);
 
-        proc_net_fops_create("decnet", S_IRUGO, &dn_socket_seq_fops);
+        proc_net_fops_create(&init_net, "decnet", S_IRUGO, &dn_socket_seq_fops);
         dn_register_sysctl();
 out:
         return rc;
@@ -2428,7 +2429,7 @@ static void __exit decnet_exit(void)
         dn_neigh_cleanup();
         dn_fib_cleanup();
 
-        proc_net_remove("decnet");
+        proc_net_remove(&init_net, "decnet");
 
         proto_unregister(&dn_proto);
 }
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 8def68209edd..83cb0761336a 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -42,6 +42,7 @@
 #include <linux/notifier.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
+#include <net/net_namespace.h>
 #include <net/neighbour.h>
 #include <net/dst.h>
 #include <net/flow.h>
@@ -1462,7 +1463,7 @@ void __init dn_dev_init(void)
         rtnl_register(PF_DECnet, RTM_DELADDR, dn_nl_deladdr, NULL);
         rtnl_register(PF_DECnet, RTM_GETADDR, NULL, dn_nl_dump_ifaddr);
 
-        proc_net_fops_create("decnet_dev", S_IRUGO, &dn_dev_seq_fops);
+        proc_net_fops_create(&init_net, "decnet_dev", S_IRUGO, &dn_dev_seq_fops);
 
 #ifdef CONFIG_SYSCTL
         {
@@ -1483,7 +1484,7 @@ void __exit dn_dev_cleanup(void)
         }
 #endif /* CONFIG_SYSCTL */
 
-        proc_net_remove("decnet_dev");
+        proc_net_remove(&init_net, "decnet_dev");
 
         dn_dev_devices_off();
 }
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c
index 174d8a7a6dac..a424a8ddbaf7 100644
--- a/net/decnet/dn_neigh.c
+++ b/net/decnet/dn_neigh.c
@@ -38,6 +38,7 @@
 #include <linux/rcupdate.h>
 #include <linux/jhash.h>
 #include <asm/atomic.h>
+#include <net/net_namespace.h>
 #include <net/neighbour.h>
 #include <net/dst.h>
 #include <net/flow.h>
@@ -611,11 +612,11 @@ static const struct file_operations dn_neigh_seq_fops = {
 void __init dn_neigh_init(void)
 {
         neigh_table_init(&dn_neigh_table);
-        proc_net_fops_create("decnet_neigh", S_IRUGO, &dn_neigh_seq_fops);
+        proc_net_fops_create(&init_net, "decnet_neigh", S_IRUGO, &dn_neigh_seq_fops);
 }
 
 void __exit dn_neigh_cleanup(void)
 {
-        proc_net_remove("decnet_neigh");
+        proc_net_remove(&init_net, "decnet_neigh");
         neigh_table_clear(&dn_neigh_table);
 }
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index a4a620971ef0..4cfea9563d2a 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -77,6 +77,7 @@
 #include <linux/rcupdate.h>
 #include <linux/times.h>
 #include <asm/errno.h>
+#include <net/net_namespace.h>
 #include <net/netlink.h>
 #include <net/neighbour.h>
 #include <net/dst.h>
@@ -1814,7 +1815,7 @@ void __init dn_route_init(void)
 
         dn_dst_ops.gc_thresh = (dn_rt_hash_mask + 1);
 
-        proc_net_fops_create("decnet_cache", S_IRUGO, &dn_rt_cache_seq_fops);
+        proc_net_fops_create(&init_net, "decnet_cache", S_IRUGO, &dn_rt_cache_seq_fops);
 
 #ifdef CONFIG_DECNET_ROUTER
         rtnl_register(PF_DECnet, RTM_GETROUTE, dn_cache_getroute, dn_fib_dump);
@@ -1829,6 +1830,6 @@ void __exit dn_route_cleanup(void)
         del_timer(&dn_route_timer);
         dn_run_flush(0);
 
-        proc_net_remove("decnet_cache");
+        proc_net_remove(&init_net, "decnet_cache");
 }