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>

diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index 7b695913cb309afa55f253eb7ae2273945dda041..ed17a57ab3cb6bce3cda4b350907e412dfe01dd1 100644 (file)
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -276,7 +276,7 @@ static int cn_init(void)
 
        cn_already_initialized = 1;
 
-       proc_net_fops_create(&init_net, "connector", S_IRUGO, &cn_file_ops);
+       proc_create("connector", S_IRUGO, init_net.proc_net, &cn_file_ops);
 
        return 0;
 }

diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index c2e5497397d5ebd3a97bbfe96e394f1030df98a0..61f28842163d5c18622bfe06eac122057f1e614b 100644 (file)
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -586,7 +586,8 @@ static int bpq_device_event(struct notifier_block *this,unsigned long event, voi
 static int __init bpq_init_driver(void)
 {
 #ifdef CONFIG_PROC_FS
-       if (!proc_net_fops_create(&init_net, "bpqether", S_IRUGO, &bpq_info_fops)) {
+       if (!proc_create("bpqether", S_IRUGO, init_net.proc_net,
+                        &bpq_info_fops)) {
                printk(KERN_ERR
                        "bpq: cannot create /proc/net/bpqether entry.\n");
                return -ENOENT;

diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index 1b4a47bd32b7a6e938e5d178899a68e7396594b9..cab13f4d29424c51cf680ae55102f400adb1fe2e 100644 (file)
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -2118,7 +2118,7 @@ static int __init scc_init_driver (void)
        }
        rtnl_unlock();
 
-       proc_net_fops_create(&init_net, "z8530drv", 0, &scc_net_seq_fops);
+       proc_create("z8530drv", 0, init_net.proc_net, &scc_net_seq_fops);
 
        return 0;
 }

diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index c6645f1017afac08dff50c54b63203903bb51031..92847d27b2e837d13b8ca6048bd2ad6b4fdf75a4 100644 (file)
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -1167,7 +1167,7 @@ static int __init yam_init_driver(void)
        yam_timer.expires = jiffies + HZ / 100;
        add_timer(&yam_timer);
 
-       proc_net_fops_create(&init_net, "yam", S_IRUGO, &yam_info_fops);
+       proc_create("yam", S_IRUGO, init_net.proc_net, &yam_info_fops);
        return 0;
  error:
        while (--i >= 0) {

diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c
index 20f31d0d1536c36658b481fa083eb6b445637ef7..d7fa96c42ae77d6f8d9d4016ac1d0ddebe686106 100644 (file)
--- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
@@ -1134,7 +1134,7 @@ static __net_init int pppoe_init_net(struct net *net)
 
        rwlock_init(&pn->hash_lock);
 
-       pde = proc_net_fops_create(net, "pppoe", S_IRUGO, &pppoe_seq_fops);
+       pde = proc_create("pppoe", S_IRUGO, net->proc_net, &pppoe_seq_fops);
 #ifdef CONFIG_PROC_FS
        if (!pde)
                return -ENOMEM;

diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 779095ded689918de025f48c47db880aa9b5d724..b6ccbea3477e79e79f42fbbbe00d3518324f39d8 100644 (file)
--- 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 5355df63d39b673d246d131564a1e17dc116c27d..8412b637407b999fb3b13b06d8602a6c3b9080bd 100644 (file)
--- 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 1932d351ed7c5e6ca24612b26bcf576458834f12..f2f81ef5bbd6cedd5a607c6ee1d0310245082bb3 100644 (file)
--- 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 b079c7bbc157a3c047db12e7a39595da380071e8..7c62ec449f3c8e3821327f8eba972824c7813d71 100644 (file)
--- 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 f1e14e20d1810f7b56b7596c4457b8ebd586a43e..b4d562ef36fb743434e1ea13f05e0531a70ca22e 100644 (file)
--- 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 0a8d6ebd9b45063ab32eba86e905b29148031ef5..d183589b77e90053f5616cd99d8ef82b8351f6c3 100644 (file)
--- 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 64d9843f9e048a0eae31157b392fb09fd74d2ecf..f916013d9074186bee13b44382a14320f4e93f1f 100644 (file)
--- 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 e47ba9fc4a0e6ce47295d85108f1d573290a2aa7..a04894a2c26ee52bee00778ba8a9c8a9e252212d 100644 (file)
--- 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 856636addd7618598be5c341cb6afd1de1ba971a..f3408f369fe30e989f524e4228553acd005bf6b1 100644 (file)
--- 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)
 {
        neigh_table_init(&dn_neigh_table);
-       proc_net_fops_create(&init_net, "decnet_neigh", S_IRUGO, &dn_neigh_seq_fops);
+       proc_create("decnet_neigh", S_IRUGO, init_net.proc_net,
+                   &dn_neigh_seq_fops);
 }
 
 void __exit dn_neigh_cleanup(void)

diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 1550028fcd8ef7803c942d2a5e246fd0ac445297..8afb257f279f2d977905e50f540a0ab013581e29 100644 (file)
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -1901,7 +1901,8 @@ void __init dn_route_init(void)
 
        dn_dst_ops.gc_thresh = (dn_rt_hash_mask + 1);
 
-       proc_net_fops_create(&init_net, "decnet_cache", S_IRUGO, &dn_rt_cache_seq_fops);
+       proc_create("decnet_cache", S_IRUGO, init_net.proc_net,
+                   &dn_rt_cache_seq_fops);
 
 #ifdef CONFIG_DECNET_ROUTER
        rtnl_register(PF_DECnet, RTM_GETROUTE, dn_cache_getroute,

diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index ded146b217f10dbd511da977fe1e146f848c8272..b04c114ef0551097080d4941916dbe1ea3a79e39 100644 (file)
--- 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 31d771ca9a709f71328c1734433cecba1fde40fd..67c1d4b641d4ced286eb30133e374889b65450cf 100644 (file)
--- 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 736ab70fd17981c95085ee0fad163aaeca39133c..be85628e6a83577c2a561643f4f71015f6a58ddb 100644 (file)
--- 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 a2e50ae80b53361ca30c718dce7e85b5e4e7c66c..98cbc6877019428f7d3400632c1e81e50145a814 100644 (file)
--- 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 7085b9b51e7f9eba5fd249ee8b5ec92096f10ca5..160a8b8e9caeb1aeaaaa3fc3bc730b820f0cc336 100644 (file)
--- 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 9682b36df38ce51213467cf0d449d465c59ab92f..48bc681f5d324531f32233342f3ba9eedd4593fb 100644 (file)
--- 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 6f9c07268cf6d433379898421e978d74fa49952f..fc62a13b5eefb31c8586fcc92114f9a9caeb0751 100644 (file)
--- 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 8de53e1ddd544b594909b9d15c96b2cad85ffa3d..954bcd42d50e8f5ce785acd5c8ce1660ca344cc4 100644 (file)
--- 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 6f08991409c3ad9d3620357d04d1f59005f7e2fa..5043a7d0c64e57dcc243cf1c52aef09cd7d68fdc 100644 (file)
--- 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 a0fcc47fee732744baf42bf1e61772faad87982d..3bdd1b1ad1b3a6e9ea0f6898d909b3cc44cded9d 100644 (file)
--- 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 4526fe68e60e0fadcbe80061b3739eb0f1ffe5c8..1e3a1fb3c0cdc14efdb499c90181c4e9476ee830 100644 (file)
--- 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);

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 86c235d05aba58669771f735e5d4e8232405fdc0..bad71083db86e4ee6e5fe5651bbc5d6a85bda669 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -3325,7 +3325,7 @@ static const struct file_operations if6_fops = {
 
 static int __net_init if6_proc_net_init(struct net *net)
 {
-       if (!proc_net_fops_create(net, "if_inet6", S_IRUGO, &if6_fops))
+       if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
                return -ENOMEM;
        return 0;
 }

diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c
index 921b8b398a8caa4cc3cbc562957a7285a88069b0..5a8c00983de555cbf9eb04bc7e5eeb86e1f49fdb 100644 (file)
--- a/net/ipv6/anycast.c
+++ b/net/ipv6/anycast.c
@@ -509,7 +509,7 @@ static const struct file_operations ac6_seq_fops = {
 
 int __net_init ac6_proc_init(struct net *net)
 {
-       if (!proc_net_fops_create(net, "anycast6", S_IRUGO, &ac6_seq_fops))
+       if (!proc_create("anycast6", S_IRUGO, net->proc_net, &ac6_seq_fops))
                return -ENOMEM;
 
        return 0;

diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
index a7da2f4724791473608e2bb745fd293a889f07e1..900d79eda51e8bf73e9be98ddd13e5f697b77a29 100644 (file)
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
@@ -806,8 +806,8 @@ static const struct file_operations ip6fl_seq_fops = {
 
 static int __net_init ip6_flowlabel_proc_init(struct net *net)
 {
-       if (!proc_net_fops_create(net, "ip6_flowlabel",
-                                 S_IRUGO, &ip6fl_seq_fops))
+       if (!proc_create("ip6_flowlabel", S_IRUGO, net->proc_net,
+                        &ip6fl_seq_fops))
                return -ENOMEM;
        return 0;
 }

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 351ce98e90d963627247c0e65ce4b3a30649d3f2..fdfd96d288edde02a8f168a33fb5efedd826ed4e 100644 (file)
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -1359,9 +1359,9 @@ static int __net_init ip6mr_net_init(struct net *net)
 
 #ifdef CONFIG_PROC_FS
        err = -ENOMEM;
-       if (!proc_net_fops_create(net, "ip6_mr_vif", 0, &ip6mr_vif_fops))
+       if (!proc_create("ip6_mr_vif", 0, net->proc_net, &ip6mr_vif_fops))
                goto proc_vif_fail;
-       if (!proc_net_fops_create(net, "ip6_mr_cache", 0, &ip6mr_mfc_fops))
+       if (!proc_create("ip6_mr_cache", 0, net->proc_net, &ip6mr_mfc_fops))
                goto proc_cache_fail;
 #endif
 

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 3a2849f660ca34838c702abda8398ce28a94d414..de7d4b9a58b0dce9123e9be085a642c7c5392d83 100644 (file)
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -2599,10 +2599,10 @@ static int __net_init igmp6_proc_init(struct net *net)
        int err;
 
        err = -ENOMEM;
-       if (!proc_net_fops_create(net, "igmp6", S_IRUGO, &igmp6_mc_seq_fops))
+       if (!proc_create("igmp6", S_IRUGO, net->proc_net, &igmp6_mc_seq_fops))
                goto out;
-       if (!proc_net_fops_create(net, "mcfilter6", S_IRUGO,
-                                 &igmp6_mcf_seq_fops))
+       if (!proc_create("mcfilter6", S_IRUGO, net->proc_net,
+                        &igmp6_mcf_seq_fops))
                goto out_proc_net_igmp6;
 
        err = 0;

diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index 745a32042950127f3509781b6247b6434743d1d7..cf8901dc653e625f5f35b12eaca875ca213098c5 100644 (file)
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -295,11 +295,11 @@ int snmp6_unregister_dev(struct inet6_dev *idev)
 
 static int __net_init ipv6_proc_init_net(struct net *net)
 {
-       if (!proc_net_fops_create(net, "sockstat6", S_IRUGO,
-                       &sockstat6_seq_fops))
+       if (!proc_create("sockstat6", S_IRUGO, net->proc_net,
+                        &sockstat6_seq_fops))
                return -ENOMEM;
 
-       if (!proc_net_fops_create(net, "snmp6", S_IRUGO, &snmp6_seq_fops))
+       if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
                goto proc_snmp6_fail;
 
        net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 70fa8144999780cef19f5102247882ba6d24f6f6..ff42fb309eec7be6c07fe8b1b6ddd04dde6d01cf 100644 (file)
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -1292,7 +1292,7 @@ static const struct file_operations raw6_seq_fops = {
 
 static int __net_init raw6_init_net(struct net *net)
 {
-       if (!proc_net_fops_create(net, "raw6", S_IRUGO, &raw6_seq_fops))
+       if (!proc_create("raw6", S_IRUGO, net->proc_net, &raw6_seq_fops))
                return -ENOMEM;
 
        return 0;

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index f3328bc1174f0d3d7825c17bc76e4ae9b5c0a9f2..e1228d839ebf15ce7ad69ca9804795797b815a06 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2995,8 +2995,8 @@ static void __net_exit ip6_route_net_exit(struct net *net)
 static int __net_init ip6_route_net_init_late(struct net *net)
 {
 #ifdef CONFIG_PROC_FS
-       proc_net_fops_create(net, "ipv6_route", 0, &ipv6_route_proc_fops);
-       proc_net_fops_create(net, "rt6_stats", S_IRUGO, &rt6_stats_seq_fops);
+       proc_create("ipv6_route", 0, net->proc_net, &ipv6_route_proc_fops);
+       proc_create("rt6_stats", S_IRUGO, net->proc_net, &rt6_stats_seq_fops);
 #endif
        return 0;
 }

diff --git a/net/key/af_key.c b/net/key/af_key.c
index 7b3ba32ca678823da54e0d14f2791cdcbb285013..021a429312b153dcf7dafdf76b138bc2747b5eda 100644 (file)
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -3740,7 +3740,7 @@ static int __net_init pfkey_init_proc(struct net *net)
 {
        struct proc_dir_entry *e;
 
-       e = proc_net_fops_create(net, "pfkey", 0, &pfkey_proc_ops);
+       e = proc_create("pfkey", 0, net->proc_net, &pfkey_proc_ops);
        if (e == NULL)
                return -ENOMEM;
 

diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index 716605c241f482e4793e86bdb1dc61d1c3596602..3ca270b4d47c65baaf1967c641b14042c8b19537 100644 (file)
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -1783,7 +1783,8 @@ static __net_init int pppol2tp_init_net(struct net *net)
        struct proc_dir_entry *pde;
        int err = 0;
 
-       pde = proc_net_fops_create(net, "pppol2tp", S_IRUGO, &pppol2tp_proc_fops);
+       pde = proc_create("pppol2tp", S_IRUGO, net->proc_net,
+                         &pppol2tp_proc_fops);
        if (!pde) {
                err = -ENOMEM;
                goto out;

diff --git a/net/netfilter/ipvs/ip_vs_app.c b/net/netfilter/ipvs/ip_vs_app.c
index 9713e6e86d472f2e2aefc5c4ebfd8f95a5cda62c..1db8a25fe4ba706e4458604991ba3d11c5636164 100644 (file)
--- 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 68e368a4beeda9ceb7ef610922459751a4016bcf..91ae11280c2419b6c7639a19f0fa307cfb8345b9 100644 (file)
--- 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 ec664cbb119f658991fd1e18134305ec08b4d5d8..7d69181f8daa862745c17256173d79d6731490b4 100644 (file)
--- 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 bdd341899ed3f933a3b124e8d6a04e8c4100796a..4c15f8d0b741daf7d19096cc91b0dd7c4f921b6a 100644 (file)
--- 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 7936bf7f90bab46a160b31f4ae82e84aee88efc5..bee9aecc7ba793c12f0e8d08133004cb4d11aeee 100644 (file)
--- 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;
 

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 74827e3b26a1b2da78e0029d250d2e20309ab895..50084c40a129c97ed3289a89c620ee51cdf5f5a6 100644 (file)
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -2145,7 +2145,7 @@ static const struct net_proto_family netlink_family_ops = {
 static int __net_init netlink_net_init(struct net *net)
 {
 #ifdef CONFIG_PROC_FS
-       if (!proc_net_fops_create(net, "netlink", 0, &netlink_seq_fops))
+       if (!proc_create("netlink", 0, net->proc_net, &netlink_seq_fops))
                return -ENOMEM;
 #endif
        return 0;

diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 7261eb81974ff9f3761976372c9272db04a62abd..71b861338407ff53c2ddc305c7af0f94ae8e8756 100644 (file)
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -1452,9 +1452,9 @@ static int __init nr_proto_init(void)
 
        nr_loopback_init();
 
-       proc_net_fops_create(&init_net, "nr", S_IRUGO, &nr_info_fops);
-       proc_net_fops_create(&init_net, "nr_neigh", S_IRUGO, &nr_neigh_fops);
-       proc_net_fops_create(&init_net, "nr_nodes", S_IRUGO, &nr_nodes_fops);
+       proc_create("nr", S_IRUGO, init_net.proc_net, &nr_info_fops);
+       proc_create("nr_neigh", S_IRUGO, init_net.proc_net, &nr_neigh_fops);
+       proc_create("nr_nodes", S_IRUGO, init_net.proc_net, &nr_nodes_fops);
 out:
        return rc;
 fail:

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index c111bd0e083a5576d86dfc8f9ad91ab320c46efa..b7b2d56126c4d25a97ad74068d56407beed56cf2 100644 (file)
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -3828,7 +3828,7 @@ static int __net_init packet_net_init(struct net *net)
        mutex_init(&net->packet.sklist_lock);
        INIT_HLIST_HEAD(&net->packet.sklist);
 
-       if (!proc_net_fops_create(net, "packet", 0, &packet_seq_fops))
+       if (!proc_create("packet", 0, net->proc_net, &packet_seq_fops))
                return -ENOMEM;
 
        return 0;

diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c
index 5bf6341e2dd47b1f1a0f6dd3a7a3f9c9c28562c3..0e527c9dd04192693bf42962640e791a76bcc591 100644 (file)
--- a/net/phonet/pn_dev.c
+++ b/net/phonet/pn_dev.c
@@ -320,7 +320,7 @@ static int __net_init phonet_init_net(struct net *net)
 {
        struct phonet_net *pnn = phonet_pernet(net);
 
-       if (!proc_net_fops_create(net, "phonet", 0, &pn_sock_seq_fops))
+       if (!proc_create("phonet", 0, net->proc_net, &pn_sock_seq_fops))
                return -ENOMEM;
 
        INIT_LIST_HEAD(&pnn->pndevs.list);
@@ -348,7 +348,7 @@ int __init phonet_device_init(void)
        if (err)
                return err;
 
-       proc_net_fops_create(&init_net, "pnresource", 0, &pn_res_seq_fops);
+       proc_create("pnresource", 0, init_net.proc_net, &pn_res_seq_fops);
        register_netdevice_notifier(&phonet_device_notifier);
        err = phonet_netlink_register();
        if (err)

diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index c4719ce604c28040b1cfdc9bff0f3a9ee4d2200d..5fd8aacbb5ae2c4c6487d8b76341c02cf3b3e9d1 100644 (file)
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1575,10 +1575,13 @@ static int __init rose_proto_init(void)
 
        rose_add_loopback_neigh();
 
-       proc_net_fops_create(&init_net, "rose", S_IRUGO, &rose_info_fops);
-       proc_net_fops_create(&init_net, "rose_neigh", S_IRUGO, &rose_neigh_fops);
-       proc_net_fops_create(&init_net, "rose_nodes", S_IRUGO, &rose_nodes_fops);
-       proc_net_fops_create(&init_net, "rose_routes", S_IRUGO, &rose_routes_fops);
+       proc_create("rose", S_IRUGO, init_net.proc_net, &rose_info_fops);
+       proc_create("rose_neigh", S_IRUGO, init_net.proc_net,
+                   &rose_neigh_fops);
+       proc_create("rose_nodes", S_IRUGO, init_net.proc_net,
+                   &rose_nodes_fops);
+       proc_create("rose_routes", S_IRUGO, init_net.proc_net,
+                   &rose_routes_fops);
 out:
        return rc;
 fail:

diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index 5b0fd291babb9c1de343a0bfdd28b4054e392b4d..59c7c7d59402c429a29bb597231aa38f103dbb0c 100644 (file)
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -839,8 +839,9 @@ static int __init af_rxrpc_init(void)
        }
 
 #ifdef CONFIG_PROC_FS
-       proc_net_fops_create(&init_net, "rxrpc_calls", 0, &rxrpc_call_seq_fops);
-       proc_net_fops_create(&init_net, "rxrpc_conns", 0, &rxrpc_connection_seq_fops);
+       proc_create("rxrpc_calls", 0, init_net.proc_net, &rxrpc_call_seq_fops);
+       proc_create("rxrpc_conns", 0, init_net.proc_net,
+                   &rxrpc_connection_seq_fops);
 #endif
        return 0;
 

diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index fe1ba54b93f7506612fdd4fc46ae2f967124776d..d8cf7d3dfe8c9233544ef5431a41859d97af2bbe 100644 (file)
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -1768,7 +1768,7 @@ static int __net_init psched_net_init(struct net *net)
 {
        struct proc_dir_entry *e;
 
-       e = proc_net_fops_create(net, "psched", 0, &psched_fops);
+       e = proc_create("psched", 0, net->proc_net, &psched_fops);
        if (e == NULL)
                return -ENOMEM;
 

diff --git a/net/sctp/probe.c b/net/sctp/probe.c
index 261b7b9858a4fc208e11365673f8f5bdd0f870a2..dd507f5ca8e7e617706b9d4cce2a820c23ba1a8e 100644 (file)
--- a/net/sctp/probe.c
+++ b/net/sctp/probe.c
@@ -195,8 +195,8 @@ static __init int sctpprobe_init(void)
        if (kfifo_alloc(&sctpw.fifo, bufsize, GFP_KERNEL))
                return ret;
 
-       if (!proc_net_fops_create(&init_net, procname, S_IRUSR,
-                                 &sctpprobe_fops))
+       if (!proc_create(procname, S_IRUSR, init_net.proc_net,
+                        &sctpprobe_fops))
                goto free_kfifo;
 
        ret = register_jprobe(&sctp_recv_probe);

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 0c612361c1534fa3edaaa0961873f2351371ee5e..0c479b6f407c84963a5066dbd9f3676e0d1cf590 100644 (file)
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2402,7 +2402,7 @@ static int __net_init unix_net_init(struct net *net)
                goto out;
 
 #ifdef CONFIG_PROC_FS
-       if (!proc_net_fops_create(net, "unix", 0, &unix_seq_fops)) {
+       if (!proc_create("unix", 0, net->proc_net, &unix_seq_fops)) {
                unix_sysctl_unregister(net);
                goto out;
        }

diff --git a/net/wireless/wext-proc.c b/net/wireless/wext-proc.c
index 8bafa31fa9f83d25909770b6b0202d6e2a282a37..00fc5bb3fb6359baabc02b92f081571523cd90a3 100644 (file)
--- a/net/wireless/wext-proc.c
+++ b/net/wireless/wext-proc.c
@@ -143,7 +143,8 @@ static const struct file_operations wireless_seq_fops = {
 int __net_init wext_proc_init(struct net *net)
 {
        /* Create /proc/net/wireless entry */
-       if (!proc_net_fops_create(net, "wireless", S_IRUGO, &wireless_seq_fops))
+       if (!proc_create("wireless", S_IRUGO, net->proc_net,
+                        &wireless_seq_fops))
                return -ENOMEM;
 
        return 0;

diff --git a/net/xfrm/xfrm_proc.c b/net/xfrm/xfrm_proc.c
index 603903853e89802099ca81aaba6a9f38bc38c161..9abe14fb59b551bd20106557bea504fbd4c49d0f 100644 (file)
--- a/net/xfrm/xfrm_proc.c
+++ b/net/xfrm/xfrm_proc.c
@@ -74,8 +74,8 @@ static const struct file_operations xfrm_statistics_seq_fops = {
 
 int __net_init xfrm_proc_init(struct net *net)
 {
-       if (!proc_net_fops_create(net, "xfrm_stat", S_IRUGO,
-                                 &xfrm_statistics_seq_fops))
+       if (!proc_create("xfrm_stat", S_IRUGO, net->proc_net,
+                        &xfrm_statistics_seq_fops))
                return -ENOMEM;
        return 0;
 }