From: David Goulet <dgoulet@efficios.com>
Date: Fri, 26 Oct 2012 17:23:25 +0000 (-0400)
Subject: Fix: UST app clean list node usage
X-Git-Tag: v2.1.0-rc6~11
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=659ed79f6b4a6ebbe7219a0fd4a347d24d62c545;p=lttng-tools.git

Fix: UST app clean list node usage

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index c93f93dc9..6f73c6df3 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -1702,21 +1702,22 @@ error:
 void ust_app_clean_list(void)
 {
 	int ret;
+	struct ust_app *app;
 	struct lttng_ht_iter iter;
-	struct lttng_ht_node_ulong *node;
 
 	DBG2("UST app cleaning registered apps hash table");
 
 	rcu_read_lock();
 
-	cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, node, node) {
+	cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) {
 		ret = lttng_ht_del(ust_app_ht, &iter);
 		assert(!ret);
-		call_rcu(&node->head, delete_ust_app_rcu);
+		call_rcu(&app->pid_n.head, delete_ust_app_rcu);
 	}
 
 	/* Cleanup socket hash table */
-	cds_lfht_for_each_entry(ust_app_ht_by_sock->ht, &iter.iter, node, node) {
+	cds_lfht_for_each_entry(ust_app_ht_by_sock->ht, &iter.iter, app,
+			sock_n.node) {
 		ret = lttng_ht_del(ust_app_ht_by_sock, &iter);
 		assert(!ret);
 	}