X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=85904c812cdbab2f53ef0747014ad274a2e38ac4;hp=6c6386d2b3b1107255260110175743fa04ccf9bf;hb=9363801e2d2069022a05e67066d8f527538946d0;hpb=fdadac0853f699c7dc829162955cc8f459b6d2f2

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 6c6386d2b..85904c812 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -690,9 +690,6 @@ static int update_kernel_stream(struct consumer_data *consumer_data, int fd)
 					rcu_read_lock();
 					cds_lfht_for_each_entry(ksess->consumer->socks->ht,
 							&iter.iter, socket, node.node) {
-						/* Code flow error */
-						assert(socket->fd);
-
 						pthread_mutex_lock(socket->lock);
 						ret = kernel_consumer_send_channel_stream(socket,
 								channel, ksess,
@@ -1030,7 +1027,7 @@ restart:
 			signal_consumer_condition(consumer_data, -1);
 			goto error;
 		}
-		consumer_data->metadata_sock.fd = &consumer_data->metadata_fd;
+		consumer_data->metadata_sock.fd_ptr = &consumer_data->metadata_fd;
 		/* Create metadata socket lock. */
 		consumer_data->metadata_sock.lock = zmalloc(sizeof(pthread_mutex_t));
 		if (consumer_data->metadata_sock.lock == NULL) {
@@ -1173,8 +1170,8 @@ error:
 		}
 		consumer_data->cmd_sock = -1;
 	}
-	if (*consumer_data->metadata_sock.fd >= 0) {
-		ret = close(*consumer_data->metadata_sock.fd);
+	if (*consumer_data->metadata_sock.fd_ptr >= 0) {
+		ret = close(*consumer_data->metadata_sock.fd_ptr);
 		if (ret) {
 			PERROR("close");
 		}