Sync lttng-modules ABI in internal kernel-ioctl.h

[lttng-tools.git] / src / bin / lttng-sessiond / notification-thread-events.c

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index 414e5dd8aec0afd90a685eb1a23a53f315b2e554..2d37af07c6504a1c55eedd2c829418ef16d0a6eb 100644 (file)
--- 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) {