From aa29f2d33bae1396b7bd4766b7442ca780fa712e Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 26 Sep 2014 18:09:29 -0400 Subject: [PATCH] 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 --- lttng-statedump-impl.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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; -- 2.34.1