The following commit has been merged in the master branch: commit af5abf67b45ebf83923b7f31239d5e1ab896ee45 Author: Marek Lindner lindner_marek@yahoo.de Date: Sat Oct 9 11:44:43 2010 +0000

batman-adv: use rcu callbacks when freeing gw_nodes

Signed-off-by: Marek Lindner lindner_marek@yahoo.de

diff --git a/gateway_client.c b/gateway_client.c index d275560..ae1ab1e 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -36,6 +36,14 @@ static void gw_node_free_ref(struct kref *refcount) kfree(gw_node); }

+static void gw_node_free_rcu(struct rcu_head *rcu) +{ + struct gw_node *gw_node; + + gw_node = container_of(rcu, struct gw_node, rcu); + kref_put(&gw_node->refcount, gw_node_free_ref); +} + void *gw_get_selected(struct bat_priv *bat_priv) { struct gw_node *curr_gateway_tmp = bat_priv->curr_gw; @@ -314,8 +322,7 @@ void gw_node_purge_deleted(struct bat_priv *bat_priv) (time_after(jiffies, gw_node->deleted + timeout))) {

hlist_del_rcu(&gw_node->list); - synchronize_rcu(); - kref_put(&gw_node->refcount, gw_node_free_ref); + call_rcu(&gw_node->rcu, gw_node_free_rcu); } }

@@ -333,8 +340,7 @@ void gw_node_list_free(struct bat_priv *bat_priv) hlist_for_each_entry_safe(gw_node, node, node_tmp, &bat_priv->gw_list, list) { hlist_del_rcu(&gw_node->list); - synchronize_rcu(); - kref_put(&gw_node->refcount, gw_node_free_ref); + call_rcu(&gw_node->rcu, gw_node_free_rcu); }

gw_deselect(bat_priv); diff --git a/types.h b/types.h index 9c13862..93b3519 100644 --- a/types.h +++ b/types.h @@ -97,6 +97,7 @@ struct gw_node { struct orig_node *orig_node; unsigned long deleted; struct kref refcount; + struct rcu_head rcu; };

/**