X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=fc954d28d46cccf1a4e55ab5a938a619c822f808;hb=13a7bce327fb908d2ddafba17cadebbb13389f12;hp=83eb01673336fb8af82333677fcdd22998276314;hpb=ca939de8e5178bd731b86d0c4588ca84cc0d16f8;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 83eb01673..fc954d28d 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -2371,7 +2371,12 @@ static int spawn_consumer_thread(struct consumer_data *consumer_data)
 	int ret, clock_ret;
 	struct timespec timeout;
 
-	/* Make sure we set the readiness flag to 0 because we are NOT ready */
+	/*
+	 * Make sure we set the readiness flag to 0 because we are NOT ready.
+	 * This access to consumer_thread_is_ready does not need to be
+	 * protected by consumer_data.cond_mutex (yet) since the consumer
+	 * management thread has not been started at this point.
+	 */
 	consumer_data->consumer_thread_is_ready = 0;
 
 	/* Setup pthread condition */
@@ -4202,7 +4207,6 @@ static void *thread_manage_health(void *data)
 	sock = lttcomm_create_unix_sock(health_unix_sock_path);
 	if (sock < 0) {
 		ERR("Unable to create health check Unix socket");
-		ret = -1;
 		goto error;
 	}
 
@@ -4213,7 +4217,6 @@ static void *thread_manage_health(void *data)
 		if (ret < 0) {
 			ERR("Unable to set group on %s", health_unix_sock_path);
 			PERROR("chown");
-			ret = -1;
 			goto error;
 		}
 
@@ -4222,7 +4225,6 @@ static void *thread_manage_health(void *data)
 		if (ret < 0) {
 			ERR("Unable to set permissions on %s", health_unix_sock_path);
 			PERROR("chmod");
-			ret = -1;
 			goto error;
 		}
 	}
@@ -4924,10 +4926,6 @@ static int set_option(int opt, const char *arg, const char *optname)
 		} else {
 			unsigned long v;
 
-			if (!arg) {
-				ret = -EINVAL;
-				goto end;
-			}
 			errno = 0;
 			v = strtoul(arg, NULL, 0);
 			if (errno != 0 || !isdigit(arg[0])) {