X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fwrapper%2Ffdtable.h;h=fa5f720775577a11c6693903d29840d3dc2efc53;hb=6e1649431d63071a951fb9a73ae0f94d69f503df;hp=8f01a194a7b5131e152b342441b0d258924fa56f;hpb=cf41b81e4a59a36acef130dcaf34defd901eb870;p=lttng-modules.git diff --git a/include/wrapper/fdtable.h b/include/wrapper/fdtable.h index 8f01a194..fa5f7207 100644 --- a/include/wrapper/fdtable.h +++ b/include/wrapper/fdtable.h @@ -8,11 +8,11 @@ #ifndef _LTTNG_WRAPPER_FDTABLE_H #define _LTTNG_WRAPPER_FDTABLE_H -#include +#include #include #include -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)) static inline struct file *lttng_lookup_fd_rcu(unsigned int fd) { @@ -26,38 +26,4 @@ struct file *lttng_lookup_fd_rcu(unsigned int fd) } #endif -#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) -{ - return close_on_exec(fd, fdt); -} - -#else - -static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt) -{ - return FD_ISSET(fd, fdt->close_on_exec); -} - -#endif - #endif /* _LTTNG_WRAPPER_FDTABLE_H */