fix: move lttng_close_on_exec to proper wrapper

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

diff --git a/wrapper/fdtable.h b/wrapper/fdtable.h
index 7e74290e94c7ff5b8c1a4f38a1cad05c9e930eaf..8f73559796a0655cdd36e770c674c60e23ba4a46 100644 (file)
--- a/wrapper/fdtable.h
+++ b/wrapper/fdtable.h
@@ -1,26 +1,13 @@
-#ifndef _LTTNG_WRAPPER_FDTABLE_H
-#define _LTTNG_WRAPPER_FDTABLE_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * wrapper/fdtable.h
  *
  * Copyright (C) 2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef _LTTNG_WRAPPER_FDTABLE_H
+#define _LTTNG_WRAPPER_FDTABLE_H
+
 #include <linux/version.h>
 #include <linux/fdtable.h>
 
@@ -41,4 +28,21 @@ int lttng_iterate_fd(struct files_struct *files,
 #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 */