X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=2d37af07c6504a1c55eedd2c829418ef16d0a6eb;hb=b8e2fb80c105c5a8241f7b35744e4a86d7e4125c;hp=414e5dd8aec0afd90a685eb1a23a53f315b2e554;hpb=5a6306f7bf0d3cca6ec732230d114a9df309cde2;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index 414e5dd8a..2d37af07c 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -3954,6 +3954,12 @@ int handle_notification_thread_client_in(
 		goto end;
 	}
 
+	if (client->communication.inbound.bytes_to_receive == 0 &&
+			client->communication.inbound.fds_to_receive != 0) {
+		/* Only FDs left to receive. */
+		goto receive_fds;
+	}
+
 	offset = client->communication.inbound.payload.buffer.size -
 			client->communication.inbound.bytes_to_receive;
 	if (client->communication.inbound.expect_creds) {
@@ -3982,6 +3988,7 @@ int handle_notification_thread_client_in(
 		goto end;
 	}
 
+receive_fds:
 	assert(client->communication.inbound.bytes_to_receive == 0);
 
 	/* Receive fds. */
@@ -4468,7 +4475,7 @@ struct lttng_event_notifier_notification *recv_one_event_notifier_notification(
 	size_t reception_size;
 
 	struct lttng_ust_abi_event_notifier_notification ust_notification;
-	struct lttng_kernel_event_notifier_notification kernel_notification;
+	struct lttng_kernel_abi_event_notifier_notification kernel_notification;
 
 	/* Init lttng_event_notifier_notification */
 	switch(domain) {