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>
This commit is contained in:

committed by
David S. Miller

parent
510a1e7249
commit
d4beaa66ad
@@ -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;
|
||||
}
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
}
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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;
|
||||
|
@@ -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);
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user