From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 26 Sep 2014 22:09:29 +0000 (-0400)
Subject: Fix: statedump: close_on_exec flag backward compat
X-Git-Tag: v2.6.0-rc1~19
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=aa29f2d33bae1396b7bd4766b7442ca780fa712e;p=lttng-modules.git

Fix: statedump: close_on_exec flag backward compat

Older kernels (e.g. 3.2.62) use FD_ISSET() to test close_on_exec flag.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index 864637dd..656cebb2 100644
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -214,6 +214,18 @@ int lttng_enumerate_network_ip_interface(struct lttng_session *session)
 }
 #endif /* CONFIG_INET */
 
+#ifdef FD_ISSET	/* For old kernels lacking close_on_exec() */
+static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
+{
+	return FD_ISSET(fd, fdt->close_on_exec);
+}
+#else
+static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
+{
+	return close_on_exec(fd, fdt);
+}
+#endif
+
 static
 int lttng_dump_one_fd(const void *p, struct file *file, unsigned int fd)
 {
@@ -237,7 +249,7 @@ int lttng_dump_one_fd(const void *p, struct file *file, unsigned int fd)
 	 * the lock is taken, but we are not aware whether this is
 	 * guaranteed or not, so play safe.
 	 */
-	if (fd < fdt->max_fds && test_bit(fd, fdt->close_on_exec))
+	if (fd < fdt->max_fds && lttng_close_on_exec(fd, fdt))
 		flags |= O_CLOEXEC;
 	if (IS_ERR(s)) {
 		struct dentry *dentry = file->f_path.dentry;