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>
This commit is contained in:
Gao feng 2013-02-18 01:34:56 +00:00 committed by David S. Miller
parent b4278c961a
commit ece31ffd53
60 changed files with 112 additions and 112 deletions

View file

@ -4532,11 +4532,11 @@ static int __net_init dev_proc_net_init(struct net *net)
out:
return rc;
out_ptype:
proc_net_remove(net, "ptype");
remove_proc_entry("ptype", net->proc_net);
out_softnet:
proc_net_remove(net, "softnet_stat");
remove_proc_entry("softnet_stat", net->proc_net);
out_dev:
proc_net_remove(net, "dev");
remove_proc_entry("dev", net->proc_net);
goto out;
}
@ -4544,9 +4544,9 @@ static void __net_exit dev_proc_net_exit(struct net *net)
{
wext_proc_exit(net);
proc_net_remove(net, "ptype");
proc_net_remove(net, "softnet_stat");
proc_net_remove(net, "dev");
remove_proc_entry("ptype", net->proc_net);
remove_proc_entry("softnet_stat", net->proc_net);
remove_proc_entry("dev", net->proc_net);
}
static struct pernet_operations __net_initdata dev_proc_ops = {