X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=a9bb2157e16b4089fa309bfb05c953bbf574780a;hb=54773d681e44cb32d6923bd2db0dcecd4bd10079;hp=b9c2177fa4f24b9fb31a7f75c7744ebbf6ba359d;hpb=c30ce0b3d524a2c15bc688356d50d38fa9b43f85;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index b9c2177fa..a9bb2157e 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1849,12 +1849,6 @@ static int copy_session_consumer(int domain, struct ltt_session *session)
 		goto error;
 	}
 
-	ret = consumer_set_subdir(session->consumer, session->name);
-	if (ret < 0) {
-		ret = LTTCOMM_FATAL;
-		goto error;
-	}
-
 	/* Append correct directory to subdir */
 	strncat(consumer->subdir, dir_name,
 			sizeof(consumer->subdir) - strlen(consumer->subdir) - 1);
@@ -2033,6 +2027,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 		pthread_mutex_lock(&kconsumer_data.pid_mutex);
 		if (kconsumer_data.pid > 0) {
 			ret = LTTCOMM_KERN_CONSUMER_FAIL;
+			pthread_mutex_unlock(&kconsumer_data.pid_mutex);
 			goto error;
 		}
 		pthread_mutex_unlock(&kconsumer_data.pid_mutex);