X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Fwrapper%2Ffdtable.h;h=fa5f720775577a11c6693903d29840d3dc2efc53;hb=f39b4a3cbff6d286025bd692aaa24ae6f8efb40b;hp=996199a7b00093a4615362fc17f0fb1ea7241b70;hpb=117ab60f69a98dcbc365de8008ab93e6699d153a;p=lttng-modules.git

diff --git a/include/wrapper/fdtable.h b/include/wrapper/fdtable.h
index 996199a7..fa5f7207 100644
--- a/include/wrapper/fdtable.h
+++ b/include/wrapper/fdtable.h
@@ -8,41 +8,22 @@
 #ifndef _LTTNG_WRAPPER_FDTABLE_H
 #define _LTTNG_WRAPPER_FDTABLE_H
 
-#include <linux/version.h>
+#include <lttng/kernel-version.h>
 #include <linux/fdtable.h>
+#include <linux/sched.h>
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0))
-
-int lttng_iterate_fd(struct files_struct *files,
-		unsigned int first,
-		int (*cb)(const void *, struct file *, unsigned int),
-		const void *ctx);
-
-#else
-
-/*
- * iterate_fd() appeared at commit
- * c3c073f808b22dfae15ef8412b6f7b998644139a in the Linux kernel (first
- * released kernel: v3.7).
- */
-#define lttng_iterate_fd	iterate_fd
-
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
-
-static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
+static inline
+struct file *lttng_lookup_fd_rcu(unsigned int fd)
 {
-	return close_on_exec(fd, fdt);
+	return lookup_fd_rcu(fd);
 }
-
 #else
-
-static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
+static inline
+struct file *lttng_lookup_fd_rcu(unsigned int fd)
 {
-	return FD_ISSET(fd, fdt->close_on_exec);
+	return fcheck(fd);
 }
-
 #endif
 
 #endif /* _LTTNG_WRAPPER_FDTABLE_H */