[linux-next] LinuxNextTracking branch, master, updated. next-20110624

batman at open-mesh.org batman at open-mesh.org
Fri Jun 24 16:09:29 CEST 2011


The following commit has been merged in the master branch:
commit 8e3572cff70ee19a0a1f2e2dde0bca0b7c8b54dc
Author: Paul E. McKenney <paulmck at linux.vnet.ibm.com>
Date:   Mon May 2 00:52:23 2011 -0700

    batman,rcu: convert call_rcu(softif_neigh_free_rcu) to kfree_rcu
    
    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 at linux.vnet.ibm.com>
    Cc: Marek Lindner <lindner_marek at yahoo.de>
    Cc: Simon Wunderlich <siwu at hrz.tu-chemnitz.de>
    Acked-by: David S. Miller <davem at davemloft.net>
    Reviewed-by: Josh Triplett <josh at joshtriplett.org>
    Acked-by: Sven Eckelmann <sven at narfation.org>

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)

-- 
LinuxNextTracking


More information about the linux-merge mailing list