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>

1 files changed, 5 insertions, 5 deletions

diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index 954bcd42d50e..32030a24e776 100644
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -482,18 +482,18 @@ static __net_init int ip_proc_init_net(struct net *net)
         return 0;
 
 out_snmp:
-        proc_net_remove(net, "netstat");
+        remove_proc_entry("netstat", net->proc_net);
 out_netstat:
-        proc_net_remove(net, "sockstat");
+        remove_proc_entry("sockstat", net->proc_net);
 out_sockstat:
         return -ENOMEM;
 }
 
 static __net_exit void ip_proc_exit_net(struct net *net)
 {
-        proc_net_remove(net, "snmp");
-        proc_net_remove(net, "netstat");
-        proc_net_remove(net, "sockstat");
+        remove_proc_entry("snmp", net->proc_net);
+        remove_proc_entry("netstat", net->proc_net);
+        remove_proc_entry("sockstat", net->proc_net);
 }
 
 static __net_initdata struct pernet_operations ip_proc_ops = {