X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry.cpp;h=a6ceece9882dad64dfd20606eb2148446bad05e4;hp=2a7d6217a501b605eca4dd50c763b3d94025f5e7;hb=f139a4f9cdbea2b08d08b024ad0996fb5bebad41;hpb=b60adc34d7bdb6f1a36a8ea45164942ab54e4bbe

diff --git a/src/bin/lttng-sessiond/ust-registry.cpp b/src/bin/lttng-sessiond/ust-registry.cpp
index 2a7d6217a..a6ceece98 100644
--- a/src/bin/lttng-sessiond/ust-registry.cpp
+++ b/src/bin/lttng-sessiond/ust-registry.cpp
@@ -33,11 +33,10 @@ namespace lsu = lttng::sessiond::ust;
  */
 static void ust_registry_event_destroy_rcu(struct rcu_head *head)
 {
-	struct lttng_ht_node_u64 *node = lttng::utils::container_of(head, &lttng_ht_node_u64::head);
 	DIAGNOSTIC_PUSH
 	DIAGNOSTIC_IGNORE_INVALID_OFFSETOF
 	lttng::sessiond::ust::registry_event *event =
-			lttng::utils::container_of(node, &lttng::sessiond::ust::registry_event::_node);
+			lttng::utils::container_of(head, &lttng::sessiond::ust::registry_event::_head);
 	DIAGNOSTIC_POP
 
 	lttng::sessiond::ust::registry_event_destroy(event);
@@ -58,11 +57,11 @@ void ust_registry_channel_destroy_event(lsu::registry_channel *chan,
 	ASSERT_RCU_READ_LOCKED();
 
 	/* Delete the node first. */
-	iter.iter.node = &event->_node.node;
+	iter.iter.node = &event->_node;
 	ret = lttng_ht_del(chan->_events, &iter);
 	LTTNG_ASSERT(!ret);
 
-	call_rcu(&event->_node.head, ust_registry_event_destroy_rcu);
+	call_rcu(&event->_head, ust_registry_event_destroy_rcu);
 
 	return;
 }