X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flttng-syscalls.c;h=2fb6eda314390cefc10529a37332aaad6848f7d8;hb=a6837bed45b070b8a90292f92e3adc81c974e324;hp=ceba4e065cc1c2629762167424ea741c15521b4f;hpb=7aedbe65997b1e6ef3ea034ab11c61482ffad232;p=lttng-modules.git

diff --git a/src/lttng-syscalls.c b/src/lttng-syscalls.c
index ceba4e06..2fb6eda3 100644
--- a/src/lttng-syscalls.c
+++ b/src/lttng-syscalls.c
@@ -25,7 +25,6 @@
 
 #include <lttng/bitfield.h>
 #include <wrapper/tracepoint.h>
-#include <wrapper/file.h>
 #include <wrapper/rcu.h>
 #include <wrapper/syscall.h>
 #include <wrapper/limits.h>
@@ -66,34 +65,6 @@ enum sc_type {
 void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id);
 void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret);
 
-/*
- * Forward declarations for old kernels.
- */
-struct mmsghdr;
-struct rlimit64;
-struct oldold_utsname;
-struct old_utsname;
-struct sel_arg_struct;
-struct mmap_arg_struct;
-struct file_handle;
-struct user_msghdr;
-struct __kernel_old_itimerval;
-struct open_how;
-struct mount_attr;
-struct futex_waitv;
-
-/*
- * Forward declaration for kernels >= 5.6
- */
-struct timex;
-struct timeval;
-struct itimerval;
-struct itimerspec;
-
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0))
-typedef __kernel_old_time_t time_t;
-#endif
-
 #ifdef IA32_NR_syscalls
 #define NR_compat_syscalls IA32_NR_syscalls
 #else
@@ -825,17 +796,17 @@ int lttng_event_enabler_create_syscall_events_if_missing(struct lttng_event_enab
 	}
 
 	if (!syscall_table->sys_enter_registered) {
-		ret = lttng_wrapper_tracepoint_probe_register("sys_enter",
+		ret = lttng_tracepoint_probe_register("sys_enter",
 				(void *) syscall_entry_event_probe, syscall_table);
 		if (ret)
 			return ret;
 		syscall_table->sys_enter_registered = 1;
 	}
 	if (!syscall_table->sys_exit_registered) {
-		ret = lttng_wrapper_tracepoint_probe_register("sys_exit",
+		ret = lttng_tracepoint_probe_register("sys_exit",
 				(void *) syscall_exit_event_probe, syscall_table);
 		if (ret) {
-			WARN_ON_ONCE(lttng_wrapper_tracepoint_probe_unregister("sys_enter",
+			WARN_ON_ONCE(lttng_tracepoint_probe_unregister("sys_enter",
 				(void *) syscall_entry_event_probe, syscall_table));
 			return ret;
 		}
@@ -854,14 +825,14 @@ int lttng_syscalls_unregister_syscall_table(struct lttng_kernel_syscall_table *s
 	if (!syscall_table->syscall_dispatch)
 		return 0;
 	if (syscall_table->sys_enter_registered) {
-		ret = lttng_wrapper_tracepoint_probe_unregister("sys_enter",
+		ret = lttng_tracepoint_probe_unregister("sys_enter",
 				(void *) syscall_entry_event_probe, syscall_table);
 		if (ret)
 			return ret;
 		syscall_table->sys_enter_registered = 0;
 	}
 	if (syscall_table->sys_exit_registered) {
-		ret = lttng_wrapper_tracepoint_probe_unregister("sys_exit",
+		ret = lttng_tracepoint_probe_unregister("sys_exit",
 				(void *) syscall_exit_event_probe, syscall_table);
 		if (ret)
 			return ret;
@@ -1325,7 +1296,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;