summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLai Jiangshan <laijs@cn.fujitsu.com>2011-03-18 11:42:34 +0800
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2011-05-07 22:50:56 -0700
commitbceb0f4512d448763fe98c9f37504c98bbebbed6 (patch)
treeb16a2987904949d9e02630d21e31086c7b6d4914 /net
parent4670994d150a86ebd53ab353a2af517c5465bfaf (diff)
downloadop-kernel-dev-bceb0f4512d448763fe98c9f37504c98bbebbed6.zip
op-kernel-dev-bceb0f4512d448763fe98c9f37504c98bbebbed6.tar.gz
net,rcu: convert call_rcu(__leaf_info_free_rcu) to kfree_rcu()
The rcu callback __leaf_info_free_rcu() just calls a kfree(), so we use kfree_rcu() instead of the call_rcu(__leaf_info_free_rcu). Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/fib_trie.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 5fe9b8b..11d4d28 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -350,14 +350,9 @@ static inline void free_leaf(struct leaf *l)
call_rcu_bh(&l->rcu, __leaf_free_rcu);
}
-static void __leaf_info_free_rcu(struct rcu_head *head)
-{
- kfree(container_of(head, struct leaf_info, rcu));
-}
-
static inline void free_leaf_info(struct leaf_info *leaf)
{
- call_rcu(&leaf->rcu, __leaf_info_free_rcu);
+ kfree_rcu(leaf, rcu);
}
static struct tnode *tnode_alloc(size_t size)
OpenPOWER on IntegriCloud