[v2,3/4] batman-adv: convert call_rcu(neigh_node_free_rcu) to kfree()

Message ID 1305011821-5411-3-git-send-email-sven@narfation.org (mailing list archive)
State Accepted, archived
Headers

Commit Message

Sven Eckelmann May 10, 2011, 7:17 a.m. UTC
  From: Paul E. McKenney <paulmck@linux.vnet.ibm.com>

The RCU callback neigh_node_free_rcu() just calls kfree(), so we can use
kfree_rcu() instead of call_rcu().

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Marek Lindner <lindner_marek@yahoo.de>
Cc: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Acked-by: David S. Miller <davem@davemloft.net>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
Rebased on top of current master + newest version from Paul E. McKenney

 originator.c |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)
  

Comments

Sven Eckelmann May 20, 2011, 12:29 p.m. UTC | #1
Sven Eckelmann wrote:
> From: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
> 
> The RCU callback neigh_node_free_rcu() just calls kfree(), so we can use
> kfree_rcu() instead of call_rcu().
> 
> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
> Cc: Marek Lindner <lindner_marek@yahoo.de>
> Cc: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
> Acked-by: David S. Miller <davem@davemloft.net>
> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
> Signed-off-by: Sven Eckelmann <sven@narfation.org>

Linus applied it in ae179ae433bb4ef6b6179c5c1c7b6cc7dc01c670

Applied in 178a37e6f
  

Patch

diff --git a/originator.c b/originator.c
index 080ec88..40a30bb 100644
--- a/originator.c
+++ b/originator.c
@@ -54,18 +54,10 @@  err:
 	return 0;
 }
 
-static void neigh_node_free_rcu(struct rcu_head *rcu)
-{
-	struct neigh_node *neigh_node;
-
-	neigh_node = container_of(rcu, struct neigh_node, rcu);
-	kfree(neigh_node);
-}
-
 void neigh_node_free_ref(struct neigh_node *neigh_node)
 {
 	if (atomic_dec_and_test(&neigh_node->refcount))
-		call_rcu(&neigh_node->rcu, neigh_node_free_rcu);
+		kfree_rcu(neigh_node, rcu);
 }
 
 /* increases the refcounter of a found router */