X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=01d71ce01e34f9a58f13feca4ec6f520e9664bf7;hp=d8d6c329f5d3334555f05e0418a699c46cec6dce;hb=40bbd087934edf0be7c21165786aad3fabb7e7b5;hpb=61ba6b6dc790245afa7fbec89a9811f6c7603b00

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index d8d6c329f..01d71ce01 100644
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -243,7 +243,6 @@ int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
 		struct consumer_socket *socket, struct ust_registry_session *registry)
 {
 	int ret;
-	struct ltt_session *session;
 
 	assert(ua_sess);
 	assert(ua_chan);
@@ -257,9 +256,6 @@ int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
 		goto error;
 	}
 
-	session = session_find_by_id(ua_sess->tracing_id);
-	assert(session);
-
 	pthread_mutex_lock(socket->lock);
 	ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket, registry);
 	pthread_mutex_unlock(socket->lock);
@@ -513,7 +509,9 @@ int ust_consumer_metadata_request(struct consumer_socket *socket)
 
 			memset(&msg, 0, sizeof(msg));
 			msg.cmd_type = LTTNG_ERR_UND;
+			pthread_mutex_lock(socket->lock);
 			(void) consumer_send_msg(socket, &msg);
+			pthread_mutex_unlock(socket->lock);
 			/*
 			 * This is possible since the session might have been destroyed
 			 * during a consumer metadata request. So here, return gracefully