diff options
author | Gao feng <gaofeng@cn.fujitsu.com> | 2013-02-17 20:34:56 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-02-18 14:53:08 -0500 |
commit | ece31ffd539e8e2b586b1ca5f50bc4f4591e3893 (patch) | |
tree | 05407d915a4c0be78a4aa85f54ae3b148ec91ea3 /net/ipv4/fib_trie.c | |
parent | b4278c961aca320839964e23cfc7906ff61af0c2 (diff) |
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/ipv4/fib_trie.c')
-rw-r--r-- | net/ipv4/fib_trie.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 67c1d4b641d4..61e03da3e1f5 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c | |||
@@ -2620,18 +2620,18 @@ int __net_init fib_proc_init(struct net *net) | |||
2620 | return 0; | 2620 | return 0; |
2621 | 2621 | ||
2622 | out3: | 2622 | out3: |
2623 | proc_net_remove(net, "fib_triestat"); | 2623 | remove_proc_entry("fib_triestat", net->proc_net); |
2624 | out2: | 2624 | out2: |
2625 | proc_net_remove(net, "fib_trie"); | 2625 | remove_proc_entry("fib_trie", net->proc_net); |
2626 | out1: | 2626 | out1: |
2627 | return -ENOMEM; | 2627 | return -ENOMEM; |
2628 | } | 2628 | } |
2629 | 2629 | ||
2630 | void __net_exit fib_proc_exit(struct net *net) | 2630 | void __net_exit fib_proc_exit(struct net *net) |
2631 | { | 2631 | { |
2632 | proc_net_remove(net, "fib_trie"); | 2632 | remove_proc_entry("fib_trie", net->proc_net); |
2633 | proc_net_remove(net, "fib_triestat"); | 2633 | remove_proc_entry("fib_triestat", net->proc_net); |
2634 | proc_net_remove(net, "route"); | 2634 | remove_proc_entry("route", net->proc_net); |
2635 | } | 2635 | } |
2636 | 2636 | ||
2637 | #endif /* CONFIG_PROC_FS */ | 2637 | #endif /* CONFIG_PROC_FS */ |