X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=liblttng-ustconsumer%2Flttng-ustconsumer.c;h=8305b061a882fff9021037e1716ff32fb3f36935;hp=26e680a9cd757d6bc5974dda20d6a30df3ccb9b2;hb=7fe5a50305da84bb64058c4721ff346c1b14f4ec;hpb=60b6c79cedc1023732ff0935aa85b5d0d1c2bcbf

diff --git a/liblttng-ustconsumer/lttng-ustconsumer.c b/liblttng-ustconsumer/lttng-ustconsumer.c
index 26e680a9c..8305b061a 100644
--- a/liblttng-ustconsumer/lttng-ustconsumer.c
+++ b/liblttng-ustconsumer/lttng-ustconsumer.c
@@ -278,11 +278,8 @@ int lttng_ustconsumer_allocate_channel(struct lttng_consumer_channel *chan)
 	if (!chan->handle) {
 		return -ENOMEM;
 	}
-	/*
-	 * The channel fds are passed to ustctl, we only keep a copy.
-	 */
-	chan->shm_fd_is_copy = 1;
 	chan->wait_fd_is_copy = 1;
+	chan->shm_fd = -1;
 
 	return 0;
 }
@@ -313,15 +310,14 @@ int lttng_ustconsumer_allocate_stream(struct lttng_consumer_stream *stream)
 	stream->buf = ustctl_open_stream_read(stream->chan->handle, stream->cpu);
 	if (!stream->buf)
 		return -EBUSY;
+	/* ustctl_open_stream_read has closed the shm fd. */
+	stream->wait_fd_is_copy = 1;
+	stream->shm_fd = -1;
+
 	stream->mmap_base = ustctl_get_mmap_base(stream->chan->handle, stream->buf);
 	if (!stream->mmap_base) {
 		return -EINVAL;
 	}
-	/*
-	 * The stream fds are passed to ustctl, we only keep a copy.
-	 */
-	stream->shm_fd_is_copy = 1;
-	stream->wait_fd_is_copy = 1;
 
 	return 0;
 }