X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=993e7b95cf21da8ff2f151f4412b3079f3746b40;hb=2a85be8e0e679da996b48252b1d9aebb9bb29126;hp=9ccad8be4e87dd19cd4e0212acbbd64c4330a4af;hpb=e32d7f274604b77bcd83c24994e88df3761ed658;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 9ccad8be4..993e7b95c 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -48,7 +48,7 @@ static char *create_channel_path(struct consumer_output *consumer,
 		ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s%s",
 				consumer->dst.session_root_path,
 				consumer->chunk_path,
-				consumer->subdir);
+				consumer->domain_subdir);
 		if (ret < 0) {
 			PERROR("snprintf kernel channel path");
 			goto error;
@@ -57,7 +57,7 @@ static char *create_channel_path(struct consumer_output *consumer,
 					sizeof(tmp_path), ret,
 					consumer->dst.session_root_path,
 					consumer->chunk_path,
-					consumer->subdir);
+					consumer->domain_subdir);
 			goto error;
 		}
 		pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
@@ -76,9 +76,10 @@ static char *create_channel_path(struct consumer_output *consumer,
 		}
 		DBG3("Kernel local consumer tracefile path: %s", pathname);
 	} else {
+		/* Network output. */
 		ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s",
 				consumer->dst.net.base_dir,
-				consumer->subdir);
+				consumer->domain_subdir);
 		if (ret < 0) {
 			PERROR("snprintf kernel metadata path");
 			goto error;
@@ -86,7 +87,7 @@ static char *create_channel_path(struct consumer_output *consumer,
 			ERR("Kernel channel path exceeds the maximal allowed length of of %zu bytes (%i bytes required) with path \"%s%s\"",
 					sizeof(tmp_path), ret,
 					consumer->dst.net.base_dir,
-					consumer->subdir);
+					consumer->domain_subdir);
 			goto error;
 		}
 		pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
@@ -107,6 +108,7 @@ error:
 /*
  * Sending a single channel to the consumer with command ADD_CHANNEL.
  */
+static
 int kernel_consumer_add_channel(struct consumer_socket *sock,
 		struct ltt_kernel_channel *channel,
 		struct ltt_kernel_session *ksession,