X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=97f0497cb12b14a71da7289c5030b256a8848ebd;hp=5c7b00317dabb824f378858bb05234347eec424e;hb=7b87473dc4e12b6ac5e10144eff786201d12d2f2;hpb=1b47ae5812ca04726890048e7ec9ce4186e4d590

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 5c7b00317..97f0497cb 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -2273,10 +2273,10 @@ int lttng_ustconsumer_sync_metadata(struct lttng_consumer_local_data *ctx,
 	 * because we locked the metadata thread.
 	 */
 	ret = lttng_ustconsumer_request_metadata(ctx, metadata->chan, 0, 0);
+	pthread_mutex_lock(&metadata->lock);
 	if (ret < 0) {
 		goto end;
 	}
-	pthread_mutex_lock(&metadata->lock);
 
 	ret = commit_one_metadata_packet(metadata);
 	if (ret <= 0) {
@@ -2496,6 +2496,8 @@ retry:
 		index.offset = htobe64(stream->out_fd_offset);
 		ret = get_index_values(&index, ustream);
 		if (ret < 0) {
+			err = ustctl_put_subbuf(ustream);
+			assert(err == 0);
 			goto end;
 		}
 
@@ -2503,6 +2505,8 @@ retry:
 		ret = update_stream_stats(stream);
 		if (ret < 0) {
 			PERROR("kernctl_get_events_discarded");
+			err = ustctl_put_subbuf(ustream);
+			assert(err == 0);
 			goto end;
 		}
 	} else {