[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 eb340b2f804860a51a0b92e35fd36742b6c2d6b7
Author: Paul E. McKenney <paulmck at linux.vnet.ibm.com>
Date:   Sun May 1 23:25:02 2011 -0700

    batman,rcu: convert call_rcu(gw_node_free_rcu) to kfree_rcu
    
    The RCU callback gw_node_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/gateway_client.c b/net/batman-adv/gateway_client.c
index 3cc4355..150b6ce 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -28,18 +28,10 @@
 #include <linux/udp.h>
 #include <linux/if_vlan.h>
 
-static void gw_node_free_rcu(struct rcu_head *rcu)
-{
-	struct gw_node *gw_node;
-
-	gw_node = container_of(rcu, struct gw_node, rcu);
-	kfree(gw_node);
-}
-
 static void gw_node_free_ref(struct gw_node *gw_node)
 {
 	if (atomic_dec_and_test(&gw_node->refcount))
-		call_rcu(&gw_node->rcu, gw_node_free_rcu);
+		kfree_rcu(gw_node, rcu);
 }
 
 void *gw_get_selected(struct bat_priv *bat_priv)

-- 
LinuxNextTracking


More information about the linux-merge mailing list