Namespace kernel version macros

[lttng-modules.git] / wrapper / fdtable.h

diff --git a/wrapper/fdtable.h b/wrapper/fdtable.h
index 7e74290e94c7ff5b8c1a4f38a1cad05c9e930eaf..c3a067305c2dbbfd833f8f7437fcea81eb5a6d0e 100644 (file)
--- a/wrapper/fdtable.h
+++ b/wrapper/fdtable.h
@@ -21,10 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <linux/version.h>
+#include <lttng-kernel-version.h>
 #include <linux/fdtable.h>
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0))
+#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(3,7,0))
 
 int lttng_iterate_fd(struct files_struct *files,
                unsigned int first,
@@ -41,4 +41,21 @@ int lttng_iterate_fd(struct files_struct *files,
 #define lttng_iterate_fd       iterate_fd
 
 #endif
+
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_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 */