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

    batman,rcu: 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 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/originator.c b/net/batman-adv/originator.c
index 0b91330..ed23a589 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -56,18 +56,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);
 }
 
 struct neigh_node *create_neighbor(struct orig_node *orig_node,

-- 
LinuxNextTracking


More information about the linux-merge mailing list