Skip to content

Commit d4beaa6

Browse files
Gao fengdavem330
Gao feng
authored and
davem330
committed
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 510a1e7 commit d4beaa6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+100
-86
lines changed

‎drivers/connector/connector.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ static int cn_init(void)
276276

277277
cn_already_initialized = 1;
278278

279-
proc_net_fops_create(&init_net, "connector", S_IRUGO, &cn_file_ops);
279+
proc_create("connector", S_IRUGO, init_net.proc_net, &cn_file_ops);
280280

281281
return 0;
282282
}

‎drivers/net/hamradio/bpqether.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,8 @@ static int bpq_device_event(struct notifier_block *this,unsigned long event, voi
586586
static int __init bpq_init_driver(void)
587587
{
588588
#ifdef CONFIG_PROC_FS
589-
if (!proc_net_fops_create(&init_net, "bpqether", S_IRUGO, &bpq_info_fops)) {
589+
if (!proc_create("bpqether", S_IRUGO, init_net.proc_net,
590+
&bpq_info_fops)) {
590591
printk(KERN_ERR
591592
"bpq: cannot create /proc/net/bpqether entry.\n");
592593
return -ENOENT;

‎drivers/net/hamradio/scc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2118,7 +2118,7 @@ static int __init scc_init_driver (void)
21182118
}
21192119
rtnl_unlock();
21202120

2121-
proc_net_fops_create(&init_net, "z8530drv", 0, &scc_net_seq_fops);
2121+
proc_create("z8530drv", 0, init_net.proc_net, &scc_net_seq_fops);
21222122

21232123
return 0;
21242124
}

‎drivers/net/hamradio/yam.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,7 @@ static int __init yam_init_driver(void)
11671167
yam_timer.expires = jiffies + HZ / 100;
11681168
add_timer(&yam_timer);
11691169

1170-
proc_net_fops_create(&init_net, "yam", S_IRUGO, &yam_info_fops);
1170+
proc_create("yam", S_IRUGO, init_net.proc_net, &yam_info_fops);
11711171
return 0;
11721172
error:
11731173
while (--i >= 0) {

‎drivers/net/ppp/pppoe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1134,7 +1134,7 @@ static __net_init int pppoe_init_net(struct net *net)
11341134

11351135
rwlock_init(&pn->hash_lock);
11361136

1137-
pde = proc_net_fops_create(net, "pppoe", S_IRUGO, &pppoe_seq_fops);
1137+
pde = proc_create("pppoe", S_IRUGO, net->proc_net, &pppoe_seq_fops);
11381138
#ifdef CONFIG_PROC_FS
11391139
if (!pde)
11401140
return -ENOMEM;

‎net/ax25/af_ax25.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1992,9 +1992,10 @@ static int __init ax25_init(void)
19921992
dev_add_pack(&ax25_packet_type);
19931993
register_netdevice_notifier(&ax25_dev_notifier);
19941994

1995-
proc_net_fops_create(&init_net, "ax25_route", S_IRUGO, &ax25_route_fops);
1996-
proc_net_fops_create(&init_net, "ax25", S_IRUGO, &ax25_info_fops);
1997-
proc_net_fops_create(&init_net, "ax25_calls", S_IRUGO, &ax25_uid_fops);
1995+
proc_create("ax25_route", S_IRUGO, init_net.proc_net,
1996+
&ax25_route_fops);
1997+
proc_create("ax25", S_IRUGO, init_net.proc_net, &ax25_info_fops);
1998+
proc_create("ax25_calls", S_IRUGO, init_net.proc_net, &ax25_uid_fops);
19981999
out:
19992000
return rc;
20002001
}

‎net/bluetooth/af_bluetooth.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ int bt_procfs_init(struct module* module, struct net *net, const char *name,
641641
sk_list->fops.llseek = seq_lseek;
642642
sk_list->fops.release = seq_release_private;
643643

644-
pde = proc_net_fops_create(net, name, 0, &sk_list->fops);
644+
pde = proc_create(name, 0, net->proc_net, &sk_list->fops);
645645
if (!pde)
646646
return -ENOMEM;
647647

‎net/core/dev.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4518,11 +4518,12 @@ static int __net_init dev_proc_net_init(struct net *net)
45184518
{
45194519
int rc = -ENOMEM;
45204520

4521-
if (!proc_net_fops_create(net, "dev", S_IRUGO, &dev_seq_fops))
4521+
if (!proc_create("dev", S_IRUGO, net->proc_net, &dev_seq_fops))
45224522
goto out;
4523-
if (!proc_net_fops_create(net, "softnet_stat", S_IRUGO, &softnet_seq_fops))
4523+
if (!proc_create("softnet_stat", S_IRUGO, net->proc_net,
4524+
&softnet_seq_fops))
45244525
goto out_dev;
4525-
if (!proc_net_fops_create(net, "ptype", S_IRUGO, &ptype_seq_fops))
4526+
if (!proc_create("ptype", S_IRUGO, net->proc_net, &ptype_seq_fops))
45264527
goto out_softnet;
45274528

45284529
if (wext_proc_init(net))

‎net/core/dev_addr_lists.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ static const struct file_operations dev_mc_seq_fops = {
780780

781781
static int __net_init dev_mc_net_init(struct net *net)
782782
{
783-
if (!proc_net_fops_create(net, "dev_mcast", 0, &dev_mc_seq_fops))
783+
if (!proc_create("dev_mcast", 0, net->proc_net, &dev_mc_seq_fops))
784784
return -ENOMEM;
785785
return 0;
786786
}

‎net/core/sock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2836,7 +2836,7 @@ static const struct file_operations proto_seq_fops = {
28362836

28372837
static __net_init int proto_init_net(struct net *net)
28382838
{
2839-
if (!proc_net_fops_create(net, "protocols", S_IRUGO, &proto_seq_fops))
2839+
if (!proc_create("protocols", S_IRUGO, net->proc_net, &proto_seq_fops))
28402840
return -ENOMEM;
28412841

28422842
return 0;

‎net/dccp/probe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ static __init int dccpprobe_init(void)
171171
spin_lock_init(&dccpw.lock);
172172
if (kfifo_alloc(&dccpw.fifo, bufsize, GFP_KERNEL))
173173
return ret;
174-
if (!proc_net_fops_create(&init_net, procname, S_IRUSR, &dccpprobe_fops))
174+
if (!proc_create(procname, S_IRUSR, init_net.proc_net, &dccpprobe_fops))
175175
goto err0;
176176

177177
ret = setup_jprobe();

‎net/decnet/af_decnet.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2384,7 +2384,7 @@ static int __init decnet_init(void)
23842384
dev_add_pack(&dn_dix_packet_type);
23852385
register_netdevice_notifier(&dn_dev_notifier);
23862386

2387-
proc_net_fops_create(&init_net, "decnet", S_IRUGO, &dn_socket_seq_fops);
2387+
proc_create("decnet", S_IRUGO, init_net.proc_net, &dn_socket_seq_fops);
23882388
dn_register_sysctl();
23892389
out:
23902390
return rc;

‎net/decnet/dn_dev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1412,7 +1412,7 @@ void __init dn_dev_init(void)
14121412
rtnl_register(PF_DECnet, RTM_DELADDR, dn_nl_deladdr, NULL, NULL);
14131413
rtnl_register(PF_DECnet, RTM_GETADDR, NULL, dn_nl_dump_ifaddr, NULL);
14141414

1415-
proc_net_fops_create(&init_net, "decnet_dev", S_IRUGO, &dn_dev_seq_fops);
1415+
proc_create("decnet_dev", S_IRUGO, init_net.proc_net, &dn_dev_seq_fops);
14161416

14171417
#ifdef CONFIG_SYSCTL
14181418
{

‎net/decnet/dn_neigh.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,8 @@ static const struct file_operations dn_neigh_seq_fops = {
590590
void __init dn_neigh_init(void)
591591
{
592592
neigh_table_init(&dn_neigh_table);
593-
proc_net_fops_create(&init_net, "decnet_neigh", S_IRUGO, &dn_neigh_seq_fops);
593+
proc_create("decnet_neigh", S_IRUGO, init_net.proc_net,
594+
&dn_neigh_seq_fops);
594595
}
595596

596597
void __exit dn_neigh_cleanup(void)

‎net/decnet/dn_route.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1901,7 +1901,8 @@ void __init dn_route_init(void)
19011901

19021902
dn_dst_ops.gc_thresh = (dn_rt_hash_mask + 1);
19031903

1904-
proc_net_fops_create(&init_net, "decnet_cache", S_IRUGO, &dn_rt_cache_seq_fops);
1904+
proc_create("decnet_cache", S_IRUGO, init_net.proc_net,
1905+
&dn_rt_cache_seq_fops);
19051906

19061907
#ifdef CONFIG_DECNET_ROUTER
19071908
rtnl_register(PF_DECnet, RTM_GETROUTE, dn_cache_getroute,

‎net/ipv4/arp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1405,7 +1405,7 @@ static const struct file_operations arp_seq_fops = {
14051405

14061406
static int __net_init arp_net_init(struct net *net)
14071407
{
1408-
if (!proc_net_fops_create(net, "arp", S_IRUGO, &arp_seq_fops))
1408+
if (!proc_create("arp", S_IRUGO, net->proc_net, &arp_seq_fops))
14091409
return -ENOMEM;
14101410
return 0;
14111411
}

‎net/ipv4/fib_trie.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2607,14 +2607,14 @@ static const struct file_operations fib_route_fops = {
26072607

26082608
int __net_init fib_proc_init(struct net *net)
26092609
{
2610-
if (!proc_net_fops_create(net, "fib_trie", S_IRUGO, &fib_trie_fops))
2610+
if (!proc_create("fib_trie", S_IRUGO, net->proc_net, &fib_trie_fops))
26112611
goto out1;
26122612

2613-
if (!proc_net_fops_create(net, "fib_triestat", S_IRUGO,
2614-
&fib_triestat_fops))
2613+
if (!proc_create("fib_triestat", S_IRUGO, net->proc_net,
2614+
&fib_triestat_fops))
26152615
goto out2;
26162616

2617-
if (!proc_net_fops_create(net, "route", S_IRUGO, &fib_route_fops))
2617+
if (!proc_create("route", S_IRUGO, net->proc_net, &fib_route_fops))
26182618
goto out3;
26192619

26202620
return 0;

‎net/ipv4/igmp.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2646,10 +2646,11 @@ static int __net_init igmp_net_init(struct net *net)
26462646
{
26472647
struct proc_dir_entry *pde;
26482648

2649-
pde = proc_net_fops_create(net, "igmp", S_IRUGO, &igmp_mc_seq_fops);
2649+
pde = proc_create("igmp", S_IRUGO, net->proc_net, &igmp_mc_seq_fops);
26502650
if (!pde)
26512651
goto out_igmp;
2652-
pde = proc_net_fops_create(net, "mcfilter", S_IRUGO, &igmp_mcf_seq_fops);
2652+
pde = proc_create("mcfilter", S_IRUGO, net->proc_net,
2653+
&igmp_mcf_seq_fops);
26532654
if (!pde)
26542655
goto out_mcfilter;
26552656
return 0;

‎net/ipv4/ipconfig.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1394,7 +1394,7 @@ static int __init ip_auto_config(void)
13941394
unsigned int i;
13951395

13961396
#ifdef CONFIG_PROC_FS
1397-
proc_net_fops_create(&init_net, "pnp", S_IRUGO, &pnp_seq_fops);
1397+
proc_create("pnp", S_IRUGO, init_net.proc_net, &pnp_seq_fops);
13981398
#endif /* CONFIG_PROC_FS */
13991399

14001400
if (!ic_enable)

‎net/ipv4/ipmr.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2703,9 +2703,9 @@ static int __net_init ipmr_net_init(struct net *net)
27032703

27042704
#ifdef CONFIG_PROC_FS
27052705
err = -ENOMEM;
2706-
if (!proc_net_fops_create(net, "ip_mr_vif", 0, &ipmr_vif_fops))
2706+
if (!proc_create("ip_mr_vif", 0, net->proc_net, &ipmr_vif_fops))
27072707
goto proc_vif_fail;
2708-
if (!proc_net_fops_create(net, "ip_mr_cache", 0, &ipmr_mfc_fops))
2708+
if (!proc_create("ip_mr_cache", 0, net->proc_net, &ipmr_mfc_fops))
27092709
goto proc_cache_fail;
27102710
#endif
27112711
return 0;

‎net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -417,12 +417,12 @@ static int __net_init ip_conntrack_net_init(struct net *net)
417417
{
418418
struct proc_dir_entry *proc, *proc_exp, *proc_stat;
419419

420-
proc = proc_net_fops_create(net, "ip_conntrack", 0440, &ct_file_ops);
420+
proc = proc_create("ip_conntrack", 0440, net->proc_net, &ct_file_ops);
421421
if (!proc)
422422
goto err1;
423423

424-
proc_exp = proc_net_fops_create(net, "ip_conntrack_expect", 0440,
425-
&ip_exp_file_ops);
424+
proc_exp = proc_create("ip_conntrack_expect", 0440, net->proc_net,
425+
&ip_exp_file_ops);
426426
if (!proc_exp)
427427
goto err2;
428428

‎net/ipv4/ping.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ static int ping_proc_register(struct net *net)
889889
struct proc_dir_entry *p;
890890
int rc = 0;
891891

892-
p = proc_net_fops_create(net, "icmp", S_IRUGO, &ping_seq_fops);
892+
p = proc_create("icmp", S_IRUGO, net->proc_net, &ping_seq_fops);
893893
if (!p)
894894
rc = -ENOMEM;
895895
return rc;

‎net/ipv4/proc.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -471,11 +471,12 @@ static const struct file_operations netstat_seq_fops = {
471471

472472
static __net_init int ip_proc_init_net(struct net *net)
473473
{
474-
if (!proc_net_fops_create(net, "sockstat", S_IRUGO, &sockstat_seq_fops))
474+
if (!proc_create("sockstat", S_IRUGO, net->proc_net,
475+
&sockstat_seq_fops))
475476
goto out_sockstat;
476-
if (!proc_net_fops_create(net, "netstat", S_IRUGO, &netstat_seq_fops))
477+
if (!proc_create("netstat", S_IRUGO, net->proc_net, &netstat_seq_fops))
477478
goto out_netstat;
478-
if (!proc_net_fops_create(net, "snmp", S_IRUGO, &snmp_seq_fops))
479+
if (!proc_create("snmp", S_IRUGO, net->proc_net, &snmp_seq_fops))
479480
goto out_snmp;
480481

481482
return 0;

‎net/ipv4/raw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ static const struct file_operations raw_seq_fops = {
10501050

10511051
static __net_init int raw_init_net(struct net *net)
10521052
{
1053-
if (!proc_net_fops_create(net, "raw", S_IRUGO, &raw_seq_fops))
1053+
if (!proc_create("raw", S_IRUGO, net->proc_net, &raw_seq_fops))
10541054
return -ENOMEM;
10551055

10561056
return 0;

‎net/ipv4/route.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,8 @@ static int __net_init ip_rt_do_proc_init(struct net *net)
384384
{
385385
struct proc_dir_entry *pde;
386386

387-
pde = proc_net_fops_create(net, "rt_cache", S_IRUGO,
388-
&rt_cache_seq_fops);
387+
pde = proc_create("rt_cache", S_IRUGO, net->proc_net,
388+
&rt_cache_seq_fops);
389389
if (!pde)
390390
goto err1;
391391

‎net/ipv4/tcp_probe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ static __init int tcpprobe_init(void)
234234
if (!tcp_probe.log)
235235
goto err0;
236236

237-
if (!proc_net_fops_create(&init_net, procname, S_IRUSR, &tcpprobe_fops))
237+
if (!proc_create(procname, S_IRUSR, init_net.proc_net, &tcpprobe_fops))
238238
goto err0;
239239

240240
ret = register_jprobe(&tcp_jprobe);

‎net/ipv6/addrconf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3325,7 +3325,7 @@ static const struct file_operations if6_fops = {
33253325

33263326
static int __net_init if6_proc_net_init(struct net *net)
33273327
{
3328-
if (!proc_net_fops_create(net, "if_inet6", S_IRUGO, &if6_fops))
3328+
if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
33293329
return -ENOMEM;
33303330
return 0;
33313331
}

‎net/ipv6/anycast.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ static const struct file_operations ac6_seq_fops = {
509509

510510
int __net_init ac6_proc_init(struct net *net)
511511
{
512-
if (!proc_net_fops_create(net, "anycast6", S_IRUGO, &ac6_seq_fops))
512+
if (!proc_create("anycast6", S_IRUGO, net->proc_net, &ac6_seq_fops))
513513
return -ENOMEM;
514514

515515
return 0;

‎net/ipv6/ip6_flowlabel.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -806,8 +806,8 @@ static const struct file_operations ip6fl_seq_fops = {
806806

807807
static int __net_init ip6_flowlabel_proc_init(struct net *net)
808808
{
809-
if (!proc_net_fops_create(net, "ip6_flowlabel",
810-
S_IRUGO, &ip6fl_seq_fops))
809+
if (!proc_create("ip6_flowlabel", S_IRUGO, net->proc_net,
810+
&ip6fl_seq_fops))
811811
return -ENOMEM;
812812
return 0;
813813
}

‎net/ipv6/ip6mr.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,9 +1359,9 @@ static int __net_init ip6mr_net_init(struct net *net)
13591359

13601360
#ifdef CONFIG_PROC_FS
13611361
err = -ENOMEM;
1362-
if (!proc_net_fops_create(net, "ip6_mr_vif", 0, &ip6mr_vif_fops))
1362+
if (!proc_create("ip6_mr_vif", 0, net->proc_net, &ip6mr_vif_fops))
13631363
goto proc_vif_fail;
1364-
if (!proc_net_fops_create(net, "ip6_mr_cache", 0, &ip6mr_mfc_fops))
1364+
if (!proc_create("ip6_mr_cache", 0, net->proc_net, &ip6mr_mfc_fops))
13651365
goto proc_cache_fail;
13661366
#endif
13671367

‎net/ipv6/mcast.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2599,10 +2599,10 @@ static int __net_init igmp6_proc_init(struct net *net)
25992599
int err;
26002600

26012601
err = -ENOMEM;
2602-
if (!proc_net_fops_create(net, "igmp6", S_IRUGO, &igmp6_mc_seq_fops))
2602+
if (!proc_create("igmp6", S_IRUGO, net->proc_net, &igmp6_mc_seq_fops))
26032603
goto out;
2604-
if (!proc_net_fops_create(net, "mcfilter6", S_IRUGO,
2605-
&igmp6_mcf_seq_fops))
2604+
if (!proc_create("mcfilter6", S_IRUGO, net->proc_net,
2605+
&igmp6_mcf_seq_fops))
26062606
goto out_proc_net_igmp6;
26072607

26082608
err = 0;

‎net/ipv6/proc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,11 +295,11 @@ int snmp6_unregister_dev(struct inet6_dev *idev)
295295

296296
static int __net_init ipv6_proc_init_net(struct net *net)
297297
{
298-
if (!proc_net_fops_create(net, "sockstat6", S_IRUGO,
299-
&sockstat6_seq_fops))
298+
if (!proc_create("sockstat6", S_IRUGO, net->proc_net,
299+
&sockstat6_seq_fops))
300300
return -ENOMEM;
301301

302-
if (!proc_net_fops_create(net, "snmp6", S_IRUGO, &snmp6_seq_fops))
302+
if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
303303
goto proc_snmp6_fail;
304304

305305
net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);

‎net/ipv6/raw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1292,7 +1292,7 @@ static const struct file_operations raw6_seq_fops = {
12921292

12931293
static int __net_init raw6_init_net(struct net *net)
12941294
{
1295-
if (!proc_net_fops_create(net, "raw6", S_IRUGO, &raw6_seq_fops))
1295+
if (!proc_create("raw6", S_IRUGO, net->proc_net, &raw6_seq_fops))
12961296
return -ENOMEM;
12971297

12981298
return 0;

‎net/ipv6/route.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2995,8 +2995,8 @@ static void __net_exit ip6_route_net_exit(struct net *net)
29952995
static int __net_init ip6_route_net_init_late(struct net *net)
29962996
{
29972997
#ifdef CONFIG_PROC_FS
2998-
proc_net_fops_create(net, "ipv6_route", 0, &ipv6_route_proc_fops);
2999-
proc_net_fops_create(net, "rt6_stats", S_IRUGO, &rt6_stats_seq_fops);
2998+
proc_create("ipv6_route", 0, net->proc_net, &ipv6_route_proc_fops);
2999+
proc_create("rt6_stats", S_IRUGO, net->proc_net, &rt6_stats_seq_fops);
30003000
#endif
30013001
return 0;
30023002
}

‎net/key/af_key.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3740,7 +3740,7 @@ static int __net_init pfkey_init_proc(struct net *net)
37403740
{
37413741
struct proc_dir_entry *e;
37423742

3743-
e = proc_net_fops_create(net, "pfkey", 0, &pfkey_proc_ops);
3743+
e = proc_create("pfkey", 0, net->proc_net, &pfkey_proc_ops);
37443744
if (e == NULL)
37453745
return -ENOMEM;
37463746

‎net/l2tp/l2tp_ppp.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1783,7 +1783,8 @@ static __net_init int pppol2tp_init_net(struct net *net)
17831783
struct proc_dir_entry *pde;
17841784
int err = 0;
17851785

1786-
pde = proc_net_fops_create(net, "pppol2tp", S_IRUGO, &pppol2tp_proc_fops);
1786+
pde = proc_create("pppol2tp", S_IRUGO, net->proc_net,
1787+
&pppol2tp_proc_fops);
17871788
if (!pde) {
17881789
err = -ENOMEM;
17891790
goto out;

0 commit comments

Comments
 (0)