diff mbox

[v2,4/4] batman-adv: convert call_rcu(softif_neigh_free_rcu) to kfree_rcu

Message ID 1305011821-5411-4-git-send-email-sven@narfation.org (mailing list archive)
State Accepted, archived
Commit 8bd9620303eee333e3915853ca64e722c57495dd
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 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>
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

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

Comments

Sven Eckelmann May 20, 2011, 12:30 p.m. UTC | #1 
Sven Eckelmann wrote:
> From: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
> 
> 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>
> 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 8e3572cff70ee19a0a1f2e2dde0bca0b7c8b54dc

Applied in 8bd9620
diff mbox

Patch

diff --git a/soft-interface.c b/soft-interface.c
index c76a33e..d5aa609 100644
--- a/soft-interface.c
+++ b/soft-interface.c
@@ -72,18 +72,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);
 }
 
 static void softif_neigh_vid_free_rcu(struct rcu_head *rcu)