summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorLai Jiangshan2011-03-18 04:42:34 +0100
committerPaul E. McKenney2011-05-08 07:50:56 +0200
commitbceb0f4512d448763fe98c9f37504c98bbebbed6 (patch)
treeb16a2987904949d9e02630d21e31086c7b6d4914 /net/ipv4
parentnet,rcu: convert call_rcu(fc_rport_free_rcu) to kfree_rcu() (diff)
downloadkernel-qcow2-linux-bceb0f4512d448763fe98c9f37504c98bbebbed6.tar.gz
kernel-qcow2-linux-bceb0f4512d448763fe98c9f37504c98bbebbed6.tar.xz
kernel-qcow2-linux-bceb0f4512d448763fe98c9f37504c98bbebbed6.zip
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/ipv4')
-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 5fe9b8b41df3..11d4d28190bd 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)