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>

47 files changed, 94 insertions, 81 deletions

diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 779095ded689..b6ccbea3477e 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1992,9 +1992,10 @@ static int __init ax25_init(void)
         dev_add_pack(&ax25_packet_type);
         register_netdevice_notifier(&ax25_dev_notifier);
 
-        proc_net_fops_create(&init_net, "ax25_route", S_IRUGO, &ax25_route_fops);
-        proc_net_fops_create(&init_net, "ax25", S_IRUGO, &ax25_info_fops);
-        proc_net_fops_create(&init_net, "ax25_calls", S_IRUGO, &ax25_uid_fops);
+        proc_create("ax25_route", S_IRUGO, init_net.proc_net,
+                    &ax25_route_fops);
+        proc_create("ax25", S_IRUGO, init_net.proc_net, &ax25_info_fops);
+        proc_create("ax25_calls", S_IRUGO, init_net.proc_net, &ax25_uid_fops);
 out:
         return rc;
 }
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 5355df63d39b..8412b637407b 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -641,7 +641,7 @@ int bt_procfs_init(struct module* module, struct net *net, const char *name,
         sk_list->fops.llseek    = seq_lseek;
         sk_list->fops.release   = seq_release_private;
 
-        pde = proc_net_fops_create(net, name, 0, &sk_list->fops);
+        pde = proc_create(name, 0, net->proc_net, &sk_list->fops);
         if (!pde)
                 return -ENOMEM;
 
diff --git a/net/core/dev.c b/net/core/dev.c
index 1932d351ed7c..f2f81ef5bbd6 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4518,11 +4518,12 @@ static int __net_init dev_proc_net_init(struct net *net)
 {
         int rc = -ENOMEM;
 
-        if (!proc_net_fops_create(net, "dev", S_IRUGO, &dev_seq_fops))
+        if (!proc_create("dev", S_IRUGO, net->proc_net, &dev_seq_fops))
                 goto out;
-        if (!proc_net_fops_create(net, "softnet_stat", S_IRUGO, &softnet_seq_fops))
+        if (!proc_create("softnet_stat", S_IRUGO, net->proc_net,
+                         &softnet_seq_fops))
                 goto out_dev;
-        if (!proc_net_fops_create(net, "ptype", S_IRUGO, &ptype_seq_fops))
+        if (!proc_create("ptype", S_IRUGO, net->proc_net, &ptype_seq_fops))
                 goto out_softnet;
 
         if (wext_proc_init(net))
diff --git a/net/core/dev_addr_lists.c b/net/core/dev_addr_lists.c
index b079c7bbc157..7c62ec449f3c 100644
--- a/net/core/dev_addr_lists.c
+++ b/net/core/dev_addr_lists.c
@@ -780,7 +780,7 @@ static const struct file_operations dev_mc_seq_fops = {
 
 static int __net_init dev_mc_net_init(struct net *net)
 {
-        if (!proc_net_fops_create(net, "dev_mcast", 0, &dev_mc_seq_fops))
+        if (!proc_create("dev_mcast", 0, net->proc_net, &dev_mc_seq_fops))
                 return -ENOMEM;
         return 0;
 }
diff --git a/net/core/sock.c b/net/core/sock.c
index f1e14e20d181..b4d562ef36fb 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2836,7 +2836,7 @@ static const struct file_operations proto_seq_fops = {
 
 static __net_init int proto_init_net(struct net *net)
 {
-        if (!proc_net_fops_create(net, "protocols", S_IRUGO, &proto_seq_fops))
+        if (!proc_create("protocols", S_IRUGO, net->proc_net, &proto_seq_fops))
                 return -ENOMEM;
 
         return 0;
diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index 0a8d6ebd9b45..d183589b77e9 100644
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -171,7 +171,7 @@ static __init int dccpprobe_init(void)
         spin_lock_init(&dccpw.lock);
         if (kfifo_alloc(&dccpw.fifo, bufsize, GFP_KERNEL))
                 return ret;
-        if (!proc_net_fops_create(&init_net, procname, S_IRUSR, &dccpprobe_fops))
+        if (!proc_create(procname, S_IRUSR, init_net.proc_net, &dccpprobe_fops))
                 goto err0;
 
         ret = setup_jprobe();
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index 64d9843f9e04..f916013d9074 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -2384,7 +2384,7 @@ static int __init decnet_init(void)
         dev_add_pack(&dn_dix_packet_type);
         register_netdevice_notifier(&dn_dev_notifier);
 
-        proc_net_fops_create(&init_net, "decnet", S_IRUGO, &dn_socket_seq_fops);
+        proc_create("decnet", S_IRUGO, init_net.proc_net, &dn_socket_seq_fops);
         dn_register_sysctl();
 out:
         return rc;
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index e47ba9fc4a0e..a04894a2c26e 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -1412,7 +1412,7 @@ void __init dn_dev_init(void)
         rtnl_register(PF_DECnet, RTM_DELADDR, dn_nl_deladdr, NULL, NULL);
         rtnl_register(PF_DECnet, RTM_GETADDR, NULL, dn_nl_dump_ifaddr, NULL);
 
-        proc_net_fops_create(&init_net, "decnet_dev", S_IRUGO, &dn_dev_seq_fops);
+        proc_create("decnet_dev", S_IRUGO, init_net.proc_net, &dn_dev_seq_fops);
 
 #ifdef CONFIG_SYSCTL
         {
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c
index 856636addd76..f3408f369fe3 100644
--- a/net/decnet/dn_neigh.c
+++ b/net/decnet/dn_neigh.c
@@ -590,7 +590,8 @@ static const struct file_operations dn_neigh_seq_fops = {
 void __init dn_neigh_init(void)