X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=8cca21391d43dd9b20b877bc920e14d10c1a348e;hb=03e431550191df8609f921c7b4054c57ee4644d8;hp=d7034efa5fc20175c019bd4426a1d3c4f0af1d6b;hpb=e261a6cc54e9a5567bf12c963f96fe22e9cf345c;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index d7034efa5..8cca21391 100644
--- a/src/bin/lttng-sessiond/event.c
+++ b/src/bin/lttng-sessiond/event.c
@@ -634,7 +634,7 @@ int event_agent_disable_all(struct ltt_ust_session *usess,
 		goto error;
 	}
 
-	/* Flag every event that they are now enabled. */
+	/* Disable every event. */
 	rcu_read_lock();
 	cds_lfht_for_each_entry(agt->events->ht, &iter.iter, aevent,
 			node.node) {
@@ -644,14 +644,13 @@ int event_agent_disable_all(struct ltt_ust_session *usess,
 
 		ret = event_agent_disable(usess, agt, aevent->name);
 		if (ret != LTTNG_OK) {
-			rcu_read_unlock();
-			goto error;
+			goto error_unlock;
 		}
 	}
-	rcu_read_unlock();
-
 	ret = LTTNG_OK;
 
+error_unlock:
+	rcu_read_unlock();
 error:
 	return ret;
 }