X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=e379171ae3df53ff46dbfb5ec6347aac687e396c;hb=3dad2c0ff117979532095b6bd83f59bf32a519d7;hp=54a0531d5ee80cc87a390d581e796b38c88ced85;hpb=5feafd413038626a47de89c0b29e41673b68818a;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index 54a0531d5..e379171ae 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -2052,8 +2052,11 @@ void consumer_del_metadata_stream(struct lttng_consumer_stream *stream,
 
 	pthread_mutex_lock(&consumer_data.lock);
 	pthread_mutex_lock(&stream->chan->lock);
-	pthread_mutex_lock(&stream->chan->metadata_cache->lock);
 	pthread_mutex_lock(&stream->lock);
+	if (stream->chan->metadata_cache) {
+		/* Only applicable to userspace consumers. */
+		pthread_mutex_lock(&stream->chan->metadata_cache->lock);
+	}
 
 	/* Remove any reference to that stream. */
 	consumer_stream_delete(stream, ht);
@@ -2077,8 +2080,10 @@ void consumer_del_metadata_stream(struct lttng_consumer_stream *stream,
 	 */
 	stream->chan->metadata_stream = NULL;
 
+	if (stream->chan->metadata_cache) {
+		pthread_mutex_unlock(&stream->chan->metadata_cache->lock);
+	}
 	pthread_mutex_unlock(&stream->lock);
-	pthread_mutex_unlock(&stream->chan->metadata_cache->lock);
 	pthread_mutex_unlock(&stream->chan->lock);
 	pthread_mutex_unlock(&consumer_data.lock);