net: proc: change proc_net_fops_create to proc_create

Right now, some modules such as bonding use proc_create
to create proc entries under /proc/net/, and other modules
such as ipv4 use proc_net_fops_create.

It looks a little chaos.this patch changes all of
proc_net_fops_create to proc_create. we can remove
proc_net_fops_create after this patch.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

5 files changed, 10 insertions, 9 deletions

diff --git a/net/netfilter/ipvs/ip_vs_app.c b/net/netfilter/ipvs/ip_vs_app.c
index 9713e6e86d47..1db8a25fe4ba 100644
--- a/net/netfilter/ipvs/ip_vs_app.c
+++ b/net/netfilter/ipvs/ip_vs_app.c
@@ -605,7 +605,7 @@ int __net_init ip_vs_app_net_init(struct net *net)
         struct netns_ipvs *ipvs = net_ipvs(net);
 
         INIT_LIST_HEAD(&ipvs->app_list);
-        proc_net_fops_create(net, "ip_vs_app", 0, &ip_vs_app_fops);
+        proc_create("ip_vs_app", 0, net->proc_net, &ip_vs_app_fops);
         return 0;
 }
 
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
index 68e368a4beed..91ae11280c24 100644
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -1291,8 +1291,8 @@ int __net_init ip_vs_conn_net_init(struct net *net)
 
         atomic_set(&ipvs->conn_count, 0);
 
-        proc_net_fops_create(net, "ip_vs_conn", 0, &ip_vs_conn_fops);
-        proc_net_fops_create(net, "ip_vs_conn_sync", 0, &ip_vs_conn_sync_fops);
+        proc_create("ip_vs_conn", 0, net->proc_net, &ip_vs_conn_fops);
+        proc_create("ip_vs_conn_sync", 0, net->proc_net, &ip_vs_conn_sync_fops);
         return 0;
 }
 
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index ec664cbb119f..7d69181f8daa 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -3800,10 +3800,10 @@ int __net_init ip_vs_control_net_init(struct net *net)
 
         spin_lock_init(&ipvs->tot_stats.lock);
 
-        proc_net_fops_create(net, "ip_vs", 0, &ip_vs_info_fops);
-        proc_net_fops_create(net, "ip_vs_stats", 0, &ip_vs_stats_fops);
-        proc_net_fops_create(net, "ip_vs_stats_percpu", 0,
-                             &ip_vs_stats_percpu_fops);
+        proc_create("ip_vs", 0, net->proc_net, &ip_vs_info_fops);
+        proc_create("ip_vs_stats", 0, net->proc_net, &ip_vs_stats_fops);
+        proc_create("ip_vs_stats_percpu", 0, net->proc_net,
+                    &ip_vs_stats_percpu_fops);
 
         if (ip_vs_control_net_init_sysctl(net))
                 goto err;
diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c
index bdd341899ed3..4c15f8d0b741 100644
--- a/net/netfilter/nf_conntrack_expect.c
+++ b/net/netfilter/nf_conntrack_expect.c
@@ -571,7 +571,8 @@ static int exp_proc_init(struct net *net)
 #ifdef CONFIG_NF_CONNTRACK_PROCFS
         struct proc_dir_entry *proc;
 
-        proc = proc_net_fops_create(net, "nf_conntrack_expect", 0440, &exp_file_ops);
+        proc = proc_create("nf_conntrack_expect", 0440, net->proc_net,
+                           &exp_file_ops);
         if (!proc)
                 return -ENOMEM;
 #endif /* CONFIG_NF_CONNTRACK_PROCFS */
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 7936bf7f90ba..bee9aecc7ba7 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -366,7 +366,7 @@ static int nf_conntrack_standalone_init_proc(struct net *net)
 {
         struct proc_dir_entry *pde;
 
-        pde = proc_net_fops_create(net, "nf_conntrack", 0440, &ct_file_ops);
+        pde = proc_create("nf_conntrack", 0440, net->proc_net, &ct_file_ops);
         if (!pde)
                 goto out_nf_conntrack;