11 files changed, 23 insertions, 21 deletions

diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index ded146b217f1..b04c114ef055 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -1405,7 +1405,7 @@ static const struct file_operations arp_seq_fops = {
 
 static int __net_init arp_net_init(struct net *net)
 {
-        if (!proc_net_fops_create(net, "arp", S_IRUGO, &arp_seq_fops))
+        if (!proc_create("arp", S_IRUGO, net->proc_net, &arp_seq_fops))
                 return -ENOMEM;
         return 0;
 }
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 31d771ca9a70..67c1d4b641d4 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -2607,14 +2607,14 @@ static const struct file_operations fib_route_fops = {
 
 int __net_init fib_proc_init(struct net *net)
 {
-        if (!proc_net_fops_create(net, "fib_trie", S_IRUGO, &fib_trie_fops))
+        if (!proc_create("fib_trie", S_IRUGO, net->proc_net, &fib_trie_fops))
                 goto out1;
 
-        if (!proc_net_fops_create(net, "fib_triestat", S_IRUGO,
-                                  &fib_triestat_fops))
+        if (!proc_create("fib_triestat", S_IRUGO, net->proc_net,
+                         &fib_triestat_fops))
                 goto out2;
 
-        if (!proc_net_fops_create(net, "route", S_IRUGO, &fib_route_fops))
+        if (!proc_create("route", S_IRUGO, net->proc_net, &fib_route_fops))
                 goto out3;
 
         return 0;
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 736ab70fd179..be85628e6a83 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -2646,10 +2646,11 @@ static int __net_init igmp_net_init(struct net *net)
 {
         struct proc_dir_entry *pde;
 
-        pde = proc_net_fops_create(net, "igmp", S_IRUGO, &igmp_mc_seq_fops);
+        pde = proc_create("igmp", S_IRUGO, net->proc_net, &igmp_mc_seq_fops);
         if (!pde)
                 goto out_igmp;
-        pde = proc_net_fops_create(net, "mcfilter", S_IRUGO, &igmp_mcf_seq_fops);
+        pde = proc_create("mcfilter", S_IRUGO, net->proc_net,
+                          &igmp_mcf_seq_fops);
         if (!pde)
                 goto out_mcfilter;
         return 0;
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index a2e50ae80b53..98cbc6877019 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -1394,7 +1394,7 @@ static int __init ip_auto_config(void)
         unsigned int i;
 
 #ifdef CONFIG_PROC_FS
-        proc_net_fops_create(&init_net, "pnp", S_IRUGO, &pnp_seq_fops);
+        proc_create("pnp", S_IRUGO, init_net.proc_net, &pnp_seq_fops);
 #endif /* CONFIG_PROC_FS */
 
         if (!ic_enable)
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 7085b9b51e7f..160a8b8e9cae 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -2703,9 +2703,9 @@ static int __net_init ipmr_net_init(struct net *net)
 
 #ifdef CONFIG_PROC_FS
         err = -ENOMEM;
-        if (!proc_net_fops_create(net, "ip_mr_vif", 0, &ipmr_vif_fops))
+        if (!proc_create("ip_mr_vif", 0, net->proc_net, &ipmr_vif_fops))
                 goto proc_vif_fail;
-        if (!proc_net_fops_create(net, "ip_mr_cache", 0, &ipmr_mfc_fops))
+        if (!proc_create("ip_mr_cache", 0, net->proc_net, &ipmr_mfc_fops))
                 goto proc_cache_fail;
 #endif
         return 0;
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
index 9682b36df38c..48bc681f5d32 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
@@ -417,12 +417,12 @@ static int __net_init ip_conntrack_net_init(struct net *net)
 {
         struct proc_dir_entry *proc, *proc_exp, *proc_stat;
 
-        proc = proc_net_fops_create(net, "ip_conntrack", 0440, &ct_file_ops);
+        proc = proc_create("ip_conntrack", 0440, net->proc_net, &ct_file_ops);
         if (!proc)
                 goto err1;
 
-        proc_exp = proc_net_fops_create(net, "ip_conntrack_expect", 0440,
-                                        &ip_exp_file_ops);
+        proc_exp = proc_create("ip_conntrack_expect", 0440, net->proc_net,
+                               &ip_exp_file_ops);
         if (!proc_exp)
                 goto err2;
 
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 6f9c07268cf6..fc62a13b5eef 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -889,7 +889,7 @@ static int ping_proc_register(struct net *net)
         struct proc_dir_entry *p;
         int rc = 0;
 
-        p = proc_net_fops_create(net, "icmp", S_IRUGO, &ping_seq_fops);
+        p = proc_create("icmp", S_IRUGO, net->proc_net, &ping_seq_fops);
         if (!p)
                 rc = -ENOMEM;
         return rc;
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index 8de53e1ddd54..954bcd42d50e 100644
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -471,11 +471,12 @@ static const struct file_operations netstat_seq_fops = {
 
 static __net_init int ip_proc_init_net(struct net *net)
 {
-        if (!proc_net_fops_create(net, "sockstat", S_IRUGO, &sockstat_seq_fops))
+        if (!proc_create("sockstat", S_IRUGO, net->proc_net,
+                         &sockstat_seq_fops))
                 goto out_sockstat;
-        if (!proc_net_fops_create(net, "netstat", S_IRUGO, &netstat_seq_fops))
+        if (!proc_create("netstat", S_IRUGO, net->proc_net, &netstat_seq_fops))
                 goto out_netstat;
-        if (!proc_net_fops_create(net, "snmp", S_IRUGO, &snmp_seq_fops))
+        if (!proc_create("snmp", S_IRUGO, net->proc_net, &snmp_seq_fops))
                 goto out_snmp;
 
         return 0;
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 6f08991409c3..5043a7d0c64e 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -1050,7 +1050,7 @@ static const struct file_operations raw_seq_fops = {
 
 static __net_init int raw_init_net(struct net *net)
 {
-        if (!proc_net_fops_create(net, "raw", S_IRUGO, &raw_seq_fops))
+        if (!proc_create("raw", S_IRUGO, net->proc_net, &raw_seq_fops))
                 return -ENOMEM;
 
         return 0;
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index a0fcc47fee73..3bdd1b1ad1b3 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -384,8 +384,8 @@ static int __net_init ip_rt_do_proc_init(struct net *net)
 {
         struct proc_dir_entry *pde;
 
-        pde = proc_net_fops_create(net, "rt_cache", S_IRUGO,
-                        &rt_cache_seq_fops);
+        pde = proc_create("rt_cache", S_IRUGO, net->proc_net,
+                          &rt_cache_seq_fops);
         if (!pde)
                 goto err1;
 
diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
index 4526fe68e60e..1e3a1fb3c0cd 100644
--- a/net/ipv4/tcp_probe.c
+++ b/net/ipv4/tcp_probe.c
@@ -234,7 +234,7 @@ static __init int tcpprobe_init(void)
         if (!tcp_probe.log)
                 goto err0;
 
-        if (!proc_net_fops_create(&init_net, procname, S_IRUSR, &tcpprobe_fops))
+        if (!proc_create(procname, S_IRUSR, init_net.proc_net, &tcpprobe_fops))
                 goto err0;
 
         ret = register_jprobe(&tcp_jprobe);