From 3a735fa767e8cd922c638a25e93876e37f7f66b1 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 22 Aug 2019 10:06:22 -0700 Subject: [PATCH] Fix: relayd: create_index_file error handling MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fix mixup between status and 0/-1 return value; Signed-off-by: Mathieu Desnoyers Signed-off-by: Jérémie Galarneau --- src/bin/lttng-relayd/stream.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bin/lttng-relayd/stream.c b/src/bin/lttng-relayd/stream.c index d11e436a9..043d19612 100644 --- a/src/bin/lttng-relayd/stream.c +++ b/src/bin/lttng-relayd/stream.c @@ -383,6 +383,7 @@ static int create_index_file(struct relay_stream *stream, int ret; uint32_t major, minor; char *index_subpath = NULL; + enum lttng_trace_chunk_status status; ASSERT_LOCKED(stream->lock); @@ -404,10 +405,11 @@ static int create_index_file(struct relay_stream *stream, goto end; } - ret = lttng_trace_chunk_create_subdirectory(chunk, + status = lttng_trace_chunk_create_subdirectory(chunk, index_subpath); free(index_subpath); - if (ret) { + if (status != LTTNG_TRACE_CHUNK_STATUS_OK) { + ret = -1; goto end; } stream->index_file = lttng_index_file_create_from_trace_chunk( -- 2.34.1