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

diff --git a/liblttng-ustconsumer/lttng-ustconsumer.c b/liblttng-ustconsumer/lttng-ustconsumer.c
index 26e680a9c..10213c1c9 100644
--- a/liblttng-ustconsumer/lttng-ustconsumer.c
+++ b/liblttng-ustconsumer/lttng-ustconsumer.c
@@ -33,7 +33,8 @@
 #include <lttng/lttng-ustconsumer.h>
 #include <lttng/ust-ctl.h>
 #include <lttngerr.h>
-#include <runas.h>
+
+#include "common/runas.h"
 
 extern struct lttng_consumer_global_data consumer_data;
 extern int consumer_poll_timeout;
@@ -278,11 +279,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 +311,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;
 }
@@ -398,7 +395,7 @@ int lttng_ustconsumer_on_recv_stream(struct lttng_consumer_stream *stream)
 
 	/* Opening the tracefile in write mode */
 	if (stream->path_name != NULL) {
-		ret = open_run_as(stream->path_name,
+		ret = run_as_open(stream->path_name,
 				O_WRONLY|O_CREAT|O_TRUNC,
 				S_IRWXU|S_IRWXG|S_IRWXO,
 				stream->uid, stream->gid);