Commit ece31ffd539e8e2b586b1ca5f50bc4f4591e3893
Committed by
David S. Miller
1 parent
b4278c961a
Exists in
master
and in
20 other branches
net: proc: change proc_net_remove to remove_proc_entry
proc_net_remove is only used to remove proc entries that under /proc/net,it's not a general function for removing proc entries of netns. if we want to remove some proc entries which under /proc/net/stat/, we still need to call remove_proc_entry. this patch use remove_proc_entry to replace proc_net_remove. we can remove proc_net_remove after this patch. Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Showing 60 changed files with 112 additions and 112 deletions Side-by-side Diff
- drivers/connector/connector.c
- drivers/net/hamradio/bpqether.c
- drivers/net/hamradio/scc.c
- drivers/net/hamradio/yam.c
- drivers/net/ppp/pppoe.c
- net/8021q/vlanproc.c
- net/atm/proc.c
- net/ax25/af_ax25.c
- net/bluetooth/af_bluetooth.c
- net/can/bcm.c
- net/can/proc.c
- net/core/dev.c
- net/core/dev_addr_lists.c
- net/core/pktgen.c
- net/core/sock.c
- net/dccp/probe.c
- net/decnet/af_decnet.c
- net/decnet/dn_dev.c
- net/decnet/dn_neigh.c
- net/decnet/dn_route.c
- net/ipv4/arp.c
- net/ipv4/fib_trie.c
- net/ipv4/igmp.c
- net/ipv4/ipmr.c
- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
- net/ipv4/ping.c
- net/ipv4/proc.c
- net/ipv4/raw.c
- net/ipv4/tcp_ipv4.c
- net/ipv4/tcp_probe.c
- net/ipv4/udp.c
- net/ipv6/addrconf.c
- net/ipv6/anycast.c
- net/ipv6/ip6_flowlabel.c
- net/ipv6/ip6mr.c
- net/ipv6/mcast.c
- net/ipv6/proc.c
- net/ipv6/raw.c
- net/ipv6/route.c
- net/key/af_key.c
- net/l2tp/l2tp_ppp.c
- net/netfilter/ipvs/ip_vs_app.c
- net/netfilter/ipvs/ip_vs_conn.c
- net/netfilter/ipvs/ip_vs_ctl.c
- net/netfilter/nf_conntrack_expect.c
- net/netfilter/nf_conntrack_standalone.c
- net/netfilter/x_tables.c
- net/netfilter/xt_hashlimit.c
- net/netfilter/xt_recent.c
- net/netlink/af_netlink.c
- net/netrom/af_netrom.c
- net/packet/af_packet.c
- net/phonet/pn_dev.c
- net/rose/af_rose.c
- net/rxrpc/af_rxrpc.c
- net/sched/sch_api.c
- net/sctp/probe.c
- net/unix/af_unix.c
- net/wireless/wext-proc.c
- net/xfrm/xfrm_proc.c
drivers/connector/connector.c
drivers/net/hamradio/bpqether.c
drivers/net/hamradio/scc.c
drivers/net/hamradio/yam.c
drivers/net/ppp/pppoe.c
net/8021q/vlanproc.c
... | ... | @@ -131,7 +131,7 @@ |
131 | 131 | remove_proc_entry(name_conf, vn->proc_vlan_dir); |
132 | 132 | |
133 | 133 | if (vn->proc_vlan_dir) |
134 | - proc_net_remove(net, name_root); | |
134 | + remove_proc_entry(name_root, net->proc_net); | |
135 | 135 | |
136 | 136 | /* Dynamically added entries should be cleaned up as their vlan_device |
137 | 137 | * is removed, so we should not have to take care of it here... |
net/atm/proc.c
net/ax25/af_ax25.c
... | ... | @@ -2009,9 +2009,9 @@ |
2009 | 2009 | |
2010 | 2010 | static void __exit ax25_exit(void) |
2011 | 2011 | { |
2012 | - proc_net_remove(&init_net, "ax25_route"); | |
2013 | - proc_net_remove(&init_net, "ax25"); | |
2014 | - proc_net_remove(&init_net, "ax25_calls"); | |
2012 | + remove_proc_entry("ax25_route", init_net.proc_net); | |
2013 | + remove_proc_entry("ax25", init_net.proc_net); | |
2014 | + remove_proc_entry("ax25_calls", init_net.proc_net); | |
2015 | 2015 | |
2016 | 2016 | unregister_netdevice_notifier(&ax25_dev_notifier); |
2017 | 2017 |
net/bluetooth/af_bluetooth.c
... | ... | @@ -652,7 +652,7 @@ |
652 | 652 | |
653 | 653 | void bt_procfs_cleanup(struct net *net, const char *name) |
654 | 654 | { |
655 | - proc_net_remove(net, name); | |
655 | + remove_proc_entry(name, net->proc_net); | |
656 | 656 | } |
657 | 657 | #else |
658 | 658 | int bt_procfs_init(struct module* module, struct net *net, const char *name, |
net/can/bcm.c
net/can/proc.c
net/core/dev.c
... | ... | @@ -4532,11 +4532,11 @@ |
4532 | 4532 | out: |
4533 | 4533 | return rc; |
4534 | 4534 | out_ptype: |
4535 | - proc_net_remove(net, "ptype"); | |
4535 | + remove_proc_entry("ptype", net->proc_net); | |
4536 | 4536 | out_softnet: |
4537 | - proc_net_remove(net, "softnet_stat"); | |
4537 | + remove_proc_entry("softnet_stat", net->proc_net); | |
4538 | 4538 | out_dev: |
4539 | - proc_net_remove(net, "dev"); | |
4539 | + remove_proc_entry("dev", net->proc_net); | |
4540 | 4540 | goto out; |
4541 | 4541 | } |
4542 | 4542 | |
... | ... | @@ -4544,9 +4544,9 @@ |
4544 | 4544 | { |
4545 | 4545 | wext_proc_exit(net); |
4546 | 4546 | |
4547 | - proc_net_remove(net, "ptype"); | |
4548 | - proc_net_remove(net, "softnet_stat"); | |
4549 | - proc_net_remove(net, "dev"); | |
4547 | + remove_proc_entry("ptype", net->proc_net); | |
4548 | + remove_proc_entry("softnet_stat", net->proc_net); | |
4549 | + remove_proc_entry("dev", net->proc_net); | |
4550 | 4550 | } |
4551 | 4551 | |
4552 | 4552 | static struct pernet_operations __net_initdata dev_proc_ops = { |
net/core/dev_addr_lists.c
net/core/pktgen.c
... | ... | @@ -3650,7 +3650,7 @@ |
3650 | 3650 | remove_entry: |
3651 | 3651 | remove_proc_entry(PGCTRL, pn->proc_dir); |
3652 | 3652 | remove: |
3653 | - proc_net_remove(pn->net, PG_PROC_DIR); | |
3653 | + remove_proc_entry(PG_PROC_DIR, pn->net->proc_net); | |
3654 | 3654 | return ret; |
3655 | 3655 | } |
3656 | 3656 | |
... | ... | @@ -3676,7 +3676,7 @@ |
3676 | 3676 | } |
3677 | 3677 | |
3678 | 3678 | remove_proc_entry(PGCTRL, pn->proc_dir); |
3679 | - proc_net_remove(pn->net, PG_PROC_DIR); | |
3679 | + remove_proc_entry(PG_PROC_DIR, pn->net->proc_net); | |
3680 | 3680 | } |
3681 | 3681 | |
3682 | 3682 | static struct pernet_operations pg_net_ops = { |
net/core/sock.c
net/dccp/probe.c
... | ... | @@ -181,7 +181,7 @@ |
181 | 181 | pr_info("DCCP watch registered (port=%d)\n", port); |
182 | 182 | return 0; |
183 | 183 | err1: |
184 | - proc_net_remove(&init_net, procname); | |
184 | + remove_proc_entry(procname, init_net.proc_net); | |
185 | 185 | err0: |
186 | 186 | kfifo_free(&dccpw.fifo); |
187 | 187 | return ret; |
... | ... | @@ -191,7 +191,7 @@ |
191 | 191 | static __exit void dccpprobe_exit(void) |
192 | 192 | { |
193 | 193 | kfifo_free(&dccpw.fifo); |
194 | - proc_net_remove(&init_net, procname); | |
194 | + remove_proc_entry(procname, init_net.proc_net); | |
195 | 195 | unregister_jprobe(&dccp_send_probe); |
196 | 196 | |
197 | 197 | } |
net/decnet/af_decnet.c
net/decnet/dn_dev.c
net/decnet/dn_neigh.c
net/decnet/dn_route.c
net/ipv4/arp.c
net/ipv4/fib_trie.c
... | ... | @@ -2620,18 +2620,18 @@ |
2620 | 2620 | return 0; |
2621 | 2621 | |
2622 | 2622 | out3: |
2623 | - proc_net_remove(net, "fib_triestat"); | |
2623 | + remove_proc_entry("fib_triestat", net->proc_net); | |
2624 | 2624 | out2: |
2625 | - proc_net_remove(net, "fib_trie"); | |
2625 | + remove_proc_entry("fib_trie", net->proc_net); | |
2626 | 2626 | out1: |
2627 | 2627 | return -ENOMEM; |
2628 | 2628 | } |
2629 | 2629 | |
2630 | 2630 | void __net_exit fib_proc_exit(struct net *net) |
2631 | 2631 | { |
2632 | - proc_net_remove(net, "fib_trie"); | |
2633 | - proc_net_remove(net, "fib_triestat"); | |
2634 | - proc_net_remove(net, "route"); | |
2632 | + remove_proc_entry("fib_trie", net->proc_net); | |
2633 | + remove_proc_entry("fib_triestat", net->proc_net); | |
2634 | + remove_proc_entry("route", net->proc_net); | |
2635 | 2635 | } |
2636 | 2636 | |
2637 | 2637 | #endif /* CONFIG_PROC_FS */ |
net/ipv4/igmp.c
... | ... | @@ -2656,15 +2656,15 @@ |
2656 | 2656 | return 0; |
2657 | 2657 | |
2658 | 2658 | out_mcfilter: |
2659 | - proc_net_remove(net, "igmp"); | |
2659 | + remove_proc_entry("igmp", net->proc_net); | |
2660 | 2660 | out_igmp: |
2661 | 2661 | return -ENOMEM; |
2662 | 2662 | } |
2663 | 2663 | |
2664 | 2664 | static void __net_exit igmp_net_exit(struct net *net) |
2665 | 2665 | { |
2666 | - proc_net_remove(net, "mcfilter"); | |
2667 | - proc_net_remove(net, "igmp"); | |
2666 | + remove_proc_entry("mcfilter", net->proc_net); | |
2667 | + remove_proc_entry("igmp", net->proc_net); | |
2668 | 2668 | } |
2669 | 2669 | |
2670 | 2670 | static struct pernet_operations igmp_net_ops = { |
net/ipv4/ipmr.c
... | ... | @@ -2712,7 +2712,7 @@ |
2712 | 2712 | |
2713 | 2713 | #ifdef CONFIG_PROC_FS |
2714 | 2714 | proc_cache_fail: |
2715 | - proc_net_remove(net, "ip_mr_vif"); | |
2715 | + remove_proc_entry("ip_mr_vif", net->proc_net); | |
2716 | 2716 | proc_vif_fail: |
2717 | 2717 | ipmr_rules_exit(net); |
2718 | 2718 | #endif |
... | ... | @@ -2723,8 +2723,8 @@ |
2723 | 2723 | static void __net_exit ipmr_net_exit(struct net *net) |
2724 | 2724 | { |
2725 | 2725 | #ifdef CONFIG_PROC_FS |
2726 | - proc_net_remove(net, "ip_mr_cache"); | |
2727 | - proc_net_remove(net, "ip_mr_vif"); | |
2726 | + remove_proc_entry("ip_mr_cache", net->proc_net); | |
2727 | + remove_proc_entry("ip_mr_vif", net->proc_net); | |
2728 | 2728 | #endif |
2729 | 2729 | ipmr_rules_exit(net); |
2730 | 2730 | } |
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
... | ... | @@ -433,9 +433,9 @@ |
433 | 433 | return 0; |
434 | 434 | |
435 | 435 | err3: |
436 | - proc_net_remove(net, "ip_conntrack_expect"); | |
436 | + remove_proc_entry("ip_conntrack_expect", net->proc_net); | |
437 | 437 | err2: |
438 | - proc_net_remove(net, "ip_conntrack"); | |
438 | + remove_proc_entry("ip_conntrack", net->proc_net); | |
439 | 439 | err1: |
440 | 440 | return -ENOMEM; |
441 | 441 | } |
... | ... | @@ -443,8 +443,8 @@ |
443 | 443 | static void __net_exit ip_conntrack_net_exit(struct net *net) |
444 | 444 | { |
445 | 445 | remove_proc_entry("ip_conntrack", net->proc_net_stat); |
446 | - proc_net_remove(net, "ip_conntrack_expect"); | |
447 | - proc_net_remove(net, "ip_conntrack"); | |
446 | + remove_proc_entry("ip_conntrack_expect", net->proc_net); | |
447 | + remove_proc_entry("ip_conntrack", net->proc_net); | |
448 | 448 | } |
449 | 449 | |
450 | 450 | static struct pernet_operations ip_conntrack_net_ops = { |
net/ipv4/ping.c
net/ipv4/proc.c
... | ... | @@ -482,18 +482,18 @@ |
482 | 482 | return 0; |
483 | 483 | |
484 | 484 | out_snmp: |
485 | - proc_net_remove(net, "netstat"); | |
485 | + remove_proc_entry("netstat", net->proc_net); | |
486 | 486 | out_netstat: |
487 | - proc_net_remove(net, "sockstat"); | |
487 | + remove_proc_entry("sockstat", net->proc_net); | |
488 | 488 | out_sockstat: |
489 | 489 | return -ENOMEM; |
490 | 490 | } |
491 | 491 | |
492 | 492 | static __net_exit void ip_proc_exit_net(struct net *net) |
493 | 493 | { |
494 | - proc_net_remove(net, "snmp"); | |
495 | - proc_net_remove(net, "netstat"); | |
496 | - proc_net_remove(net, "sockstat"); | |
494 | + remove_proc_entry("snmp", net->proc_net); | |
495 | + remove_proc_entry("netstat", net->proc_net); | |
496 | + remove_proc_entry("sockstat", net->proc_net); | |
497 | 497 | } |
498 | 498 | |
499 | 499 | static __net_initdata struct pernet_operations ip_proc_ops = { |
net/ipv4/raw.c
net/ipv4/tcp_ipv4.c
... | ... | @@ -2616,7 +2616,7 @@ |
2616 | 2616 | |
2617 | 2617 | void tcp_proc_unregister(struct net *net, struct tcp_seq_afinfo *afinfo) |
2618 | 2618 | { |
2619 | - proc_net_remove(net, afinfo->name); | |
2619 | + remove_proc_entry(afinfo->name, net->proc_net); | |
2620 | 2620 | } |
2621 | 2621 | EXPORT_SYMBOL(tcp_proc_unregister); |
2622 | 2622 |
net/ipv4/tcp_probe.c
... | ... | @@ -244,7 +244,7 @@ |
244 | 244 | pr_info("probe registered (port=%d) bufsize=%u\n", port, bufsize); |
245 | 245 | return 0; |
246 | 246 | err1: |
247 | - proc_net_remove(&init_net, procname); | |
247 | + remove_proc_entry(procname, init_net.proc_net); | |
248 | 248 | err0: |
249 | 249 | kfree(tcp_probe.log); |
250 | 250 | return ret; |
... | ... | @@ -253,7 +253,7 @@ |
253 | 253 | |
254 | 254 | static __exit void tcpprobe_exit(void) |
255 | 255 | { |
256 | - proc_net_remove(&init_net, procname); | |
256 | + remove_proc_entry(procname, init_net.proc_net); | |
257 | 257 | unregister_jprobe(&tcp_jprobe); |
258 | 258 | kfree(tcp_probe.log); |
259 | 259 | } |
net/ipv4/udp.c
... | ... | @@ -2122,7 +2122,7 @@ |
2122 | 2122 | |
2123 | 2123 | void udp_proc_unregister(struct net *net, struct udp_seq_afinfo *afinfo) |
2124 | 2124 | { |
2125 | - proc_net_remove(net, afinfo->name); | |
2125 | + remove_proc_entry(afinfo->name, net->proc_net); | |
2126 | 2126 | } |
2127 | 2127 | EXPORT_SYMBOL(udp_proc_unregister); |
2128 | 2128 |
net/ipv6/addrconf.c
net/ipv6/anycast.c
net/ipv6/ip6_flowlabel.c
... | ... | @@ -814,7 +814,7 @@ |
814 | 814 | |
815 | 815 | static void __net_exit ip6_flowlabel_proc_fini(struct net *net) |
816 | 816 | { |
817 | - proc_net_remove(net, "ip6_flowlabel"); | |
817 | + remove_proc_entry("ip6_flowlabel", net->proc_net); | |
818 | 818 | } |
819 | 819 | #else |
820 | 820 | static inline int ip6_flowlabel_proc_init(struct net *net) |
net/ipv6/ip6mr.c
... | ... | @@ -1369,7 +1369,7 @@ |
1369 | 1369 | |
1370 | 1370 | #ifdef CONFIG_PROC_FS |
1371 | 1371 | proc_cache_fail: |
1372 | - proc_net_remove(net, "ip6_mr_vif"); | |
1372 | + remove_proc_entry("ip6_mr_vif", net->proc_net); | |
1373 | 1373 | proc_vif_fail: |
1374 | 1374 | ip6mr_rules_exit(net); |
1375 | 1375 | #endif |
... | ... | @@ -1380,8 +1380,8 @@ |
1380 | 1380 | static void __net_exit ip6mr_net_exit(struct net *net) |
1381 | 1381 | { |
1382 | 1382 | #ifdef CONFIG_PROC_FS |
1383 | - proc_net_remove(net, "ip6_mr_cache"); | |
1384 | - proc_net_remove(net, "ip6_mr_vif"); | |
1383 | + remove_proc_entry("ip6_mr_cache", net->proc_net); | |
1384 | + remove_proc_entry("ip6_mr_vif", net->proc_net); | |
1385 | 1385 | #endif |
1386 | 1386 | ip6mr_rules_exit(net); |
1387 | 1387 | } |
net/ipv6/mcast.c
... | ... | @@ -2610,14 +2610,14 @@ |
2610 | 2610 | return err; |
2611 | 2611 | |
2612 | 2612 | out_proc_net_igmp6: |
2613 | - proc_net_remove(net, "igmp6"); | |
2613 | + remove_proc_entry("igmp6", net->proc_net); | |
2614 | 2614 | goto out; |
2615 | 2615 | } |
2616 | 2616 | |
2617 | 2617 | static void __net_exit igmp6_proc_exit(struct net *net) |
2618 | 2618 | { |
2619 | - proc_net_remove(net, "mcfilter6"); | |
2620 | - proc_net_remove(net, "igmp6"); | |
2619 | + remove_proc_entry("mcfilter6", net->proc_net); | |
2620 | + remove_proc_entry("igmp6", net->proc_net); | |
2621 | 2621 | } |
2622 | 2622 | #else |
2623 | 2623 | static inline int igmp6_proc_init(struct net *net) |
net/ipv6/proc.c
... | ... | @@ -308,17 +308,17 @@ |
308 | 308 | return 0; |
309 | 309 | |
310 | 310 | proc_dev_snmp6_fail: |
311 | - proc_net_remove(net, "snmp6"); | |
311 | + remove_proc_entry("snmp6", net->proc_net); | |
312 | 312 | proc_snmp6_fail: |
313 | - proc_net_remove(net, "sockstat6"); | |
313 | + remove_proc_entry("sockstat6", net->proc_net); | |
314 | 314 | return -ENOMEM; |
315 | 315 | } |
316 | 316 | |
317 | 317 | static void __net_exit ipv6_proc_exit_net(struct net *net) |
318 | 318 | { |
319 | - proc_net_remove(net, "sockstat6"); | |
320 | - proc_net_remove(net, "dev_snmp6"); | |
321 | - proc_net_remove(net, "snmp6"); | |
319 | + remove_proc_entry("sockstat6", net->proc_net); | |
320 | + remove_proc_entry("dev_snmp6", net->proc_net); | |
321 | + remove_proc_entry("snmp6", net->proc_net); | |
322 | 322 | } |
323 | 323 | |
324 | 324 | static struct pernet_operations ipv6_proc_ops = { |
net/ipv6/raw.c
net/ipv6/route.c
... | ... | @@ -3004,8 +3004,8 @@ |
3004 | 3004 | static void __net_exit ip6_route_net_exit_late(struct net *net) |
3005 | 3005 | { |
3006 | 3006 | #ifdef CONFIG_PROC_FS |
3007 | - proc_net_remove(net, "ipv6_route"); | |
3008 | - proc_net_remove(net, "rt6_stats"); | |
3007 | + remove_proc_entry("ipv6_route", net->proc_net); | |
3008 | + remove_proc_entry("rt6_stats", net->proc_net); | |
3009 | 3009 | #endif |
3010 | 3010 | } |
3011 | 3011 |
net/key/af_key.c
net/l2tp/l2tp_ppp.c
net/netfilter/ipvs/ip_vs_app.c
net/netfilter/ipvs/ip_vs_conn.c
... | ... | @@ -1300,8 +1300,8 @@ |
1300 | 1300 | { |
1301 | 1301 | /* flush all the connection entries first */ |
1302 | 1302 | ip_vs_conn_flush(net); |
1303 | - proc_net_remove(net, "ip_vs_conn"); | |
1304 | - proc_net_remove(net, "ip_vs_conn_sync"); | |
1303 | + remove_proc_entry("ip_vs_conn", net->proc_net); | |
1304 | + remove_proc_entry("ip_vs_conn_sync", net->proc_net); | |
1305 | 1305 | } |
1306 | 1306 | |
1307 | 1307 | int __init ip_vs_conn_init(void) |
net/netfilter/ipvs/ip_vs_ctl.c
... | ... | @@ -3822,9 +3822,9 @@ |
3822 | 3822 | ip_vs_trash_cleanup(net); |
3823 | 3823 | ip_vs_stop_estimator(net, &ipvs->tot_stats); |
3824 | 3824 | ip_vs_control_net_cleanup_sysctl(net); |
3825 | - proc_net_remove(net, "ip_vs_stats_percpu"); | |
3826 | - proc_net_remove(net, "ip_vs_stats"); | |
3827 | - proc_net_remove(net, "ip_vs"); | |
3825 | + remove_proc_entry("ip_vs_stats_percpu", net->proc_net); | |
3826 | + remove_proc_entry("ip_vs_stats", net->proc_net); | |
3827 | + remove_proc_entry("ip_vs", net->proc_net); | |
3828 | 3828 | free_percpu(ipvs->tot_stats.cpustats); |
3829 | 3829 | } |
3830 | 3830 |
net/netfilter/nf_conntrack_expect.c
... | ... | @@ -582,7 +582,7 @@ |
582 | 582 | static void exp_proc_remove(struct net *net) |
583 | 583 | { |
584 | 584 | #ifdef CONFIG_NF_CONNTRACK_PROCFS |
585 | - proc_net_remove(net, "nf_conntrack_expect"); | |
585 | + remove_proc_entry("nf_conntrack_expect", net->proc_net); | |
586 | 586 | #endif /* CONFIG_NF_CONNTRACK_PROCFS */ |
587 | 587 | } |
588 | 588 |
net/netfilter/nf_conntrack_standalone.c
... | ... | @@ -377,7 +377,7 @@ |
377 | 377 | return 0; |
378 | 378 | |
379 | 379 | out_stat_nf_conntrack: |
380 | - proc_net_remove(net, "nf_conntrack"); | |
380 | + remove_proc_entry("nf_conntrack", net->proc_net); | |
381 | 381 | out_nf_conntrack: |
382 | 382 | return -ENOMEM; |
383 | 383 | } |
... | ... | @@ -385,7 +385,7 @@ |
385 | 385 | static void nf_conntrack_standalone_fini_proc(struct net *net) |
386 | 386 | { |
387 | 387 | remove_proc_entry("nf_conntrack", net->proc_net_stat); |
388 | - proc_net_remove(net, "nf_conntrack"); | |
388 | + remove_proc_entry("nf_conntrack", net->proc_net); | |
389 | 389 | } |
390 | 390 | #else |
391 | 391 | static int nf_conntrack_standalone_init_proc(struct net *net) |
net/netfilter/x_tables.c
... | ... | @@ -1323,12 +1323,12 @@ |
1323 | 1323 | out_remove_matches: |
1324 | 1324 | strlcpy(buf, xt_prefix[af], sizeof(buf)); |
1325 | 1325 | strlcat(buf, FORMAT_MATCHES, sizeof(buf)); |
1326 | - proc_net_remove(net, buf); | |
1326 | + remove_proc_entry(buf, net->proc_net); | |
1327 | 1327 | |
1328 | 1328 | out_remove_tables: |
1329 | 1329 | strlcpy(buf, xt_prefix[af], sizeof(buf)); |
1330 | 1330 | strlcat(buf, FORMAT_TABLES, sizeof(buf)); |
1331 | - proc_net_remove(net, buf); | |
1331 | + remove_proc_entry(buf, net->proc_net); | |
1332 | 1332 | out: |
1333 | 1333 | return -1; |
1334 | 1334 | #endif |
1335 | 1335 | |
1336 | 1336 | |
... | ... | @@ -1342,15 +1342,15 @@ |
1342 | 1342 | |
1343 | 1343 | strlcpy(buf, xt_prefix[af], sizeof(buf)); |
1344 | 1344 | strlcat(buf, FORMAT_TABLES, sizeof(buf)); |
1345 | - proc_net_remove(net, buf); | |
1345 | + remove_proc_entry(buf, net->proc_net); | |
1346 | 1346 | |
1347 | 1347 | strlcpy(buf, xt_prefix[af], sizeof(buf)); |
1348 | 1348 | strlcat(buf, FORMAT_TARGETS, sizeof(buf)); |
1349 | - proc_net_remove(net, buf); | |
1349 | + remove_proc_entry(buf, net->proc_net); | |
1350 | 1350 | |
1351 | 1351 | strlcpy(buf, xt_prefix[af], sizeof(buf)); |
1352 | 1352 | strlcat(buf, FORMAT_MATCHES, sizeof(buf)); |
1353 | - proc_net_remove(net, buf); | |
1353 | + remove_proc_entry(buf, net->proc_net); | |
1354 | 1354 | #endif /*CONFIG_PROC_FS*/ |
1355 | 1355 | } |
1356 | 1356 | EXPORT_SYMBOL_GPL(xt_proto_fini); |
net/netfilter/xt_hashlimit.c
... | ... | @@ -867,7 +867,7 @@ |
867 | 867 | #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES) |
868 | 868 | hashlimit_net->ip6t_hashlimit = proc_mkdir("ip6t_hashlimit", net->proc_net); |
869 | 869 | if (!hashlimit_net->ip6t_hashlimit) { |
870 | - proc_net_remove(net, "ipt_hashlimit"); | |
870 | + remove_proc_entry("ipt_hashlimit", net->proc_net); | |
871 | 871 | return -ENOMEM; |
872 | 872 | } |
873 | 873 | #endif |
874 | 874 | |
... | ... | @@ -897,9 +897,9 @@ |
897 | 897 | hashlimit_net->ip6t_hashlimit = NULL; |
898 | 898 | mutex_unlock(&hashlimit_mutex); |
899 | 899 | |
900 | - proc_net_remove(net, "ipt_hashlimit"); | |
900 | + remove_proc_entry("ipt_hashlimit", net->proc_net); | |
901 | 901 | #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES) |
902 | - proc_net_remove(net, "ip6t_hashlimit"); | |
902 | + remove_proc_entry("ip6t_hashlimit", net->proc_net); | |
903 | 903 | #endif |
904 | 904 | } |
905 | 905 |
net/netfilter/xt_recent.c
net/netlink/af_netlink.c
net/netrom/af_netrom.c
... | ... | @@ -1482,9 +1482,9 @@ |
1482 | 1482 | { |
1483 | 1483 | int i; |
1484 | 1484 | |
1485 | - proc_net_remove(&init_net, "nr"); | |
1486 | - proc_net_remove(&init_net, "nr_neigh"); | |
1487 | - proc_net_remove(&init_net, "nr_nodes"); | |
1485 | + remove_proc_entry("nr", init_net.proc_net); | |
1486 | + remove_proc_entry("nr_neigh", init_net.proc_net); | |
1487 | + remove_proc_entry("nr_nodes", init_net.proc_net); | |
1488 | 1488 | nr_loopback_clear(); |
1489 | 1489 | |
1490 | 1490 | nr_rt_free(); |
net/packet/af_packet.c
net/phonet/pn_dev.c
... | ... | @@ -331,7 +331,7 @@ |
331 | 331 | |
332 | 332 | static void __net_exit phonet_exit_net(struct net *net) |
333 | 333 | { |
334 | - proc_net_remove(net, "phonet"); | |
334 | + remove_proc_entry("phonet", net->proc_net); | |
335 | 335 | } |
336 | 336 | |
337 | 337 | static struct pernet_operations phonet_net_ops = { |
... | ... | @@ -361,7 +361,7 @@ |
361 | 361 | rtnl_unregister_all(PF_PHONET); |
362 | 362 | unregister_netdevice_notifier(&phonet_device_notifier); |
363 | 363 | unregister_pernet_subsys(&phonet_net_ops); |
364 | - proc_net_remove(&init_net, "pnresource"); | |
364 | + remove_proc_entry("pnresource", init_net.proc_net); | |
365 | 365 | } |
366 | 366 | |
367 | 367 | int phonet_route_add(struct net_device *dev, u8 daddr) |
net/rose/af_rose.c
... | ... | @@ -1608,10 +1608,10 @@ |
1608 | 1608 | { |
1609 | 1609 | int i; |
1610 | 1610 | |
1611 | - proc_net_remove(&init_net, "rose"); | |
1612 | - proc_net_remove(&init_net, "rose_neigh"); | |
1613 | - proc_net_remove(&init_net, "rose_nodes"); | |
1614 | - proc_net_remove(&init_net, "rose_routes"); | |
1611 | + remove_proc_entry("rose", init_net.proc_net); | |
1612 | + remove_proc_entry("rose_neigh", init_net.proc_net); | |
1613 | + remove_proc_entry("rose_nodes", init_net.proc_net); | |
1614 | + remove_proc_entry("rose_routes", init_net.proc_net); | |
1615 | 1615 | rose_loopback_clear(); |
1616 | 1616 | |
1617 | 1617 | rose_rt_free(); |
net/rxrpc/af_rxrpc.c
... | ... | @@ -879,8 +879,8 @@ |
879 | 879 | |
880 | 880 | _debug("flush scheduled work"); |
881 | 881 | flush_workqueue(rxrpc_workqueue); |
882 | - proc_net_remove(&init_net, "rxrpc_conns"); | |
883 | - proc_net_remove(&init_net, "rxrpc_calls"); | |
882 | + remove_proc_entry("rxrpc_conns", init_net.proc_net); | |
883 | + remove_proc_entry("rxrpc_calls", init_net.proc_net); | |
884 | 884 | destroy_workqueue(rxrpc_workqueue); |
885 | 885 | kmem_cache_destroy(rxrpc_call_jar); |
886 | 886 | _leave(""); |
net/sched/sch_api.c
... | ... | @@ -1777,7 +1777,7 @@ |
1777 | 1777 | |
1778 | 1778 | static void __net_exit psched_net_exit(struct net *net) |
1779 | 1779 | { |
1780 | - proc_net_remove(net, "psched"); | |
1780 | + remove_proc_entry("psched", net->proc_net); | |
1781 | 1781 | } |
1782 | 1782 | #else |
1783 | 1783 | static int __net_init psched_net_init(struct net *net) |
net/sctp/probe.c
... | ... | @@ -208,7 +208,7 @@ |
208 | 208 | return 0; |
209 | 209 | |
210 | 210 | remove_proc: |
211 | - proc_net_remove(&init_net, procname); | |
211 | + remove_proc_entry(procname, init_net.proc_net); | |
212 | 212 | free_kfifo: |
213 | 213 | kfifo_free(&sctpw.fifo); |
214 | 214 | return ret; |
... | ... | @@ -217,7 +217,7 @@ |
217 | 217 | static __exit void sctpprobe_exit(void) |
218 | 218 | { |
219 | 219 | kfifo_free(&sctpw.fifo); |
220 | - proc_net_remove(&init_net, procname); | |
220 | + remove_proc_entry(procname, init_net.proc_net); | |
221 | 221 | unregister_jprobe(&sctp_recv_probe); |
222 | 222 | } |
223 | 223 |
net/unix/af_unix.c
... | ... | @@ -2415,7 +2415,7 @@ |
2415 | 2415 | static void __net_exit unix_net_exit(struct net *net) |
2416 | 2416 | { |
2417 | 2417 | unix_sysctl_unregister(net); |
2418 | - proc_net_remove(net, "unix"); | |
2418 | + remove_proc_entry("unix", net->proc_net); | |
2419 | 2419 | } |
2420 | 2420 | |
2421 | 2421 | static struct pernet_operations unix_net_ops = { |
net/wireless/wext-proc.c