X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=75b76db2ecc501d0f864dac63d8f580ff2f31452;hb=49938fb6a42264963829418b06238dd6aa529a32;hp=8e972b0693cc28362fe36e9a80b040d128bed62c;hpb=e32d7f274604b77bcd83c24994e88df3761ed658;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 8e972b069..75b76db2e 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -125,6 +125,11 @@ int kernel_create_session(struct ltt_session *session, int tracer_fd)
 
 	DBG("Kernel session created (fd: %d)", lks->fd);
 
+	ret = kernctl_session_set_name(lks->fd, session->name);
+	if (ret) {
+		WARN("Could not set kernel session name");
+	}
+
 	return 0;
 
 error:
@@ -1297,7 +1302,7 @@ enum lttng_error_code kernel_snapshot_record(struct ltt_kernel_session *ksess,
 		/* Put back the saved consumer output into the session. */
 		ksess->consumer = saved_output;
 		if (ret < 0) {
-			status = LTTNG_ERR_KERN_CONSUMER_FAIL;
+			status = LTTNG_ERR_KERN_META_FAIL;
 			goto error_consumer;
 		}
 
@@ -1432,7 +1437,7 @@ enum lttng_error_code kernel_rotate_session(struct ltt_session *session)
 					chan->key, session->name);
 			ret = consumer_rotate_channel(socket, chan->key,
 					ksess->uid, ksess->gid, ksess->consumer,
-					ksess->consumer->subdir,
+					ksess->consumer->domain_subdir,
 					/* is_metadata_channel */ false,
 					session->current_archive_id);
 			if (ret < 0) {
@@ -1446,7 +1451,7 @@ enum lttng_error_code kernel_rotate_session(struct ltt_session *session)
 		 */
 		ret = consumer_rotate_channel(socket, ksess->metadata->key,
 				ksess->uid, ksess->gid, ksess->consumer,
-				ksess->consumer->subdir,
+				ksess->consumer->domain_subdir,
 				/* is_metadata_channel */ true,
 				session->current_archive_id);
 		if (ret < 0) {