[tip/core/rcu,5/7] batman,rcu: convert call_rcu(softif_neigh_free_rcu) to kfree_rcu

Message ID 1304352824-6563-5-git-send-email-paulmck@linux.vnet.ibm.com
State New
Headers show

Commit Message

Paul E. McKenney May 2, 2011, 4:13 p.m.
The RCU callback softif_neigh_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>
Cc: Sven Eckelmann <sven@narfation.org>
---
 net/batman-adv/soft-interface.c |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

Comments

Sven Eckelmann May 3, 2011, 7:02 a.m. | #1
On Monday 02 May 2011 18:13:42 Paul E. McKenney wrote:
> The RCU callback softif_neigh_free_rcu() just calls kfree(), so we can
> use kfree_rcu() instead of call_rcu().
> 
[...]
> The RCU callback neigh_node_free_rcu() just calls kfree(), so we can use
> kfree_rcu() instead of call_rcu().
[...]
> The RCU callback gw_node_free_rcu() just calls kfree(), so we can use
> kfree_rcu() instead of call_rcu().

Thanks, I am fine with Patch 3/7, 4/7, 5/7.

Acked-by: Sven Eckelmann <sven@narfation.org>

Patch

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 824e1f6..04efe02 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -76,18 +76,10 @@  int my_skb_head_push(struct sk_buff *skb, unsigned int len)
 	return 0;
 }
 
-static void softif_neigh_free_rcu(struct rcu_head *rcu)
-{
-	struct softif_neigh *softif_neigh;
-
-	softif_neigh = container_of(rcu, struct softif_neigh, rcu);
-	kfree(softif_neigh);
-}
-
 static void softif_neigh_free_ref(struct softif_neigh *softif_neigh)
 {
 	if (atomic_dec_and_test(&softif_neigh->refcount))
-		call_rcu(&softif_neigh->rcu, softif_neigh_free_rcu);
+		kfree_rcu(softif_neigh, rcu);
 }
 
 void softif_neigh_purge(struct bat_priv *bat_priv)