The following commit has been merged in the next branch: commit 178a37e6f4bb08a6de1b573a71c80d9746c3e09b Author: Paul E. McKenney paulmck@linux.vnet.ibm.com Date: Tue May 10 09:17:00 2011 +0200
batman-adv: convert call_rcu(neigh_node_free_rcu) to kfree()
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
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 */