diff options
| author | Gao feng <gaofeng@cn.fujitsu.com> | 2013-02-18 02:34:56 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-18 20:53:08 +0100 |
| commit | ece31ffd539e8e2b586b1ca5f50bc4f4591e3893 (patch) | |
| tree | 05407d915a4c0be78a4aa85f54ae3b148ec91ea3 /net/ipv6/proc.c | |
| parent | net: proc: remove proc_net_fops_create (diff) | |
| download | linux-ece31ffd539e8e2b586b1ca5f50bc4f4591e3893.tar.xz linux-ece31ffd539e8e2b586b1ca5f50bc4f4591e3893.zip | |
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>
Diffstat (limited to 'net/ipv6/proc.c')
| -rw-r--r-- | net/ipv6/proc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c index cf8901dc653e..bbbe53a99b57 100644 --- a/net/ipv6/proc.c +++ b/net/ipv6/proc.c @@ -308,17 +308,17 @@ static int __net_init ipv6_proc_init_net(struct net *net) return 0; proc_dev_snmp6_fail: - proc_net_remove(net, "snmp6"); + remove_proc_entry("snmp6", net->proc_net); proc_snmp6_fail: - proc_net_remove(net, "sockstat6"); + remove_proc_entry("sockstat6", net->proc_net); return -ENOMEM; } static void __net_exit ipv6_proc_exit_net(struct net *net) { - proc_net_remove(net, "sockstat6"); - proc_net_remove(net, "dev_snmp6"); - proc_net_remove(net, "snmp6"); + remove_proc_entry("sockstat6", net->proc_net); + remove_proc_entry("dev_snmp6", net->proc_net); + remove_proc_entry("snmp6", net->proc_net); } static struct pernet_operations ipv6_proc_ops = { |