diff mbox

[2/4] batman-adv: use rcu callbacks when freeing gw_nodes

Message ID 1285848524-13469-3-git-send-email-lindner_marek@yahoo.de (mailing list archive)
State Accepted, archived
Headers

Commit Message

Marek Lindner Sept. 30, 2010, 12:08 p.m. UTC 
  Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
---
 batman-adv/gateway_client.c |   14 ++++++++++----
 batman-adv/types.h          |    1 +
 2 files changed, 11 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/batman-adv/gateway_client.c b/batman-adv/gateway_client.c
index d275560..ae1ab1e 100644
--- a/batman-adv/gateway_client.c
+++ b/batman-adv/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/batman-adv/types.h b/batman-adv/types.h
index f5d29e6..11f1017 100644
--- a/batman-adv/types.h
+++ b/batman-adv/types.h
@@ -97,6 +97,7 @@  struct gw_node {
 	struct orig_node *orig_node;
 	unsigned long deleted;
 	struct kref refcount;
+	struct rcu_head rcu;
 };
 
 /**