X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcontext.c;fp=src%2Fbin%2Flttng-sessiond%2Fcontext.c;h=3861d22c1e3b7cf28275badf86fb388fddfd2bd0;hp=6cf301dcd04488b1a9f02ce79584e5cf0c445dea;hb=88e3c2f5610b9ac89b0923d448fee34140fc46fb;hpb=58d3fed5a62a82ce8487dce41a3092e79a9bca15

diff --git a/src/bin/lttng-sessiond/context.c b/src/bin/lttng-sessiond/context.c
index 6cf301dcd..3861d22c1 100644
--- a/src/bin/lttng-sessiond/context.c
+++ b/src/bin/lttng-sessiond/context.c
@@ -169,18 +169,19 @@ static int add_uctx_to_channel(struct ltt_ust_session *usess,
 		goto error;
 	}
 
-	ret = ust_app_add_ctx_channel_glb(usess, uchan, uctx);
-	if (ret < 0) {
-		goto error;
-	}
-
-	rcu_read_lock();
-
 	/* Add ltt UST context node to ltt UST channel */
 	lttng_ht_add_ulong(uchan->ctx, &uctx->node);
-	rcu_read_unlock();
 	cds_list_add_tail(&uctx->list, &uchan->ctx_list);
 
+	if (!usess->active) {
+		goto end;
+	}
+
+	ret = ust_app_add_ctx_channel_glb(usess, uchan, uctx);
+	if (ret < 0) {
+		goto error;
+	}
+end:
 	DBG("Context UST %d added to channel %s", uctx->ctx.ctx, uchan->name);
 
 	return 0;