fix: Add missing 'pselect6_time32' and 'ppoll_time32' syscall overrides

[lttng-modules.git] / src / lttng-abi.c

diff --git a/src/lttng-abi.c b/src/lttng-abi.c
index 472541a2b89ba5905bd1cdefbd6b2bcd2d50f808..afd233738dc326b66e80df9ae81c53ff52520557 100644 (file)
--- a/src/lttng-abi.c
+++ b/src/lttng-abi.c
@@ -37,7 +37,6 @@
 #include <ringbuffer/frontend.h>
 #include <wrapper/compiler_attributes.h>
 #include <wrapper/poll.h>
-#include <wrapper/file.h>
 #include <wrapper/kref.h>
 #include <lttng/string-utils.h>
 #include <lttng/abi.h>
@@ -99,7 +98,7 @@ int lttng_abi_create_session(void)
        session = lttng_session_create();
        if (!session)
                return -ENOMEM;
-       session_fd = lttng_get_unused_fd();
+       session_fd = get_unused_fd_flags(0);
        if (session_fd < 0) {
                ret = session_fd;
                goto fd_error;
@@ -122,6 +121,7 @@ fd_error:
        return ret;
 }
 
+static
 void event_notifier_send_notification_work_wakeup(struct irq_work *entry)
 {
        struct lttng_event_notifier_group *event_notifier_group =
@@ -141,7 +141,7 @@ int lttng_abi_create_event_notifier_group(void)
        if (!event_notifier_group)
                return -ENOMEM;
 
-       event_notifier_group_fd = lttng_get_unused_fd();
+       event_notifier_group_fd = get_unused_fd_flags(0);
        if (event_notifier_group_fd < 0) {
                ret = event_notifier_group_fd;
                goto fd_error;
@@ -174,7 +174,7 @@ int lttng_abi_tracepoint_list(void)
        struct file *tracepoint_list_file;
        int file_fd, ret;
 
-       file_fd = lttng_get_unused_fd();
+       file_fd = get_unused_fd_flags(0);
        if (file_fd < 0) {
                ret = file_fd;
                goto fd_error;
@@ -214,7 +214,7 @@ int lttng_abi_syscall_list(void)
        struct file *syscall_list_file;
        int file_fd, ret;
 
-       file_fd = lttng_get_unused_fd();
+       file_fd = get_unused_fd_flags(0);
        if (file_fd < 0) {
                ret = file_fd;
                goto fd_error;
@@ -497,7 +497,7 @@ int lttng_abi_create_channel(struct file *session_file,
        int chan_fd;
        int ret = 0;
 
-       chan_fd = lttng_get_unused_fd();
+       chan_fd = get_unused_fd_flags(0);
        if (chan_fd < 0) {
                ret = chan_fd;
                goto fd_error;
@@ -1603,7 +1603,7 @@ int lttng_abi_create_stream_fd(struct file *channel_file, void *stream_priv,
        int stream_fd, ret;
        struct file *stream_file;
 
-       stream_fd = lttng_get_unused_fd();
+       stream_fd = get_unused_fd_flags(0);
        if (stream_fd < 0) {
                ret = stream_fd;
                goto fd_error;
@@ -1868,7 +1868,7 @@ int lttng_abi_create_event(struct file *channel_file,
                return -EINVAL;
        }
 
-       event_fd = lttng_get_unused_fd();
+       event_fd = get_unused_fd_flags(0);
        if (event_fd < 0) {
                ret = event_fd;
                goto fd_error;
@@ -2102,7 +2102,7 @@ int lttng_abi_create_event_notifier(struct file *event_notifier_group_file,
 
        event_notifier_param->event.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
 
-       event_notifier_fd = lttng_get_unused_fd();
+       event_notifier_fd = get_unused_fd_flags(0);
        if (event_notifier_fd < 0) {
                ret = event_notifier_fd;
                goto fd_error;
@@ -2249,7 +2249,7 @@ long lttng_abi_event_notifier_group_create_error_counter(
                goto fd_error;
        }
 
-       counter_fd = lttng_get_unused_fd();
+       counter_fd = get_unused_fd_flags(0);
        if (counter_fd < 0) {
                ret = counter_fd;
                goto fd_error;
@@ -2577,6 +2577,7 @@ long lttng_metadata_ioctl(struct file *file, unsigned int cmd, unsigned long arg
  *     @file: the file
  *     @wait: poll table
  */
+static
 unsigned int lttng_channel_poll(struct file *file, poll_table *wait)
 {
        struct lttng_kernel_channel_buffer *channel = file->private_data;