}
#endif
-#if (LTTNG_LINUX_VERSION_CODE < LTTNG_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 (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 */
wrapper/trace-clock.o \
wrapper/kallsyms.o \
wrapper/irqdesc.o \
- wrapper/fdtable.o \
lttng-wrapper-impl.o
ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),)
* the lock is taken, but we are not aware whether this is
* guaranteed or not, so play safe.
*/
- if (fd < fdt->max_fds && lttng_close_on_exec(fd, fdt))
+ if (fd < fdt->max_fds && close_on_exec(fd, fdt))
flags |= O_CLOEXEC;
if (IS_ERR(s)) {
struct dentry *dentry = file->f_path.dentry;
{
struct lttng_fd_ctx ctx = { .page = tmp, .session = session, .files = files, };
- lttng_iterate_fd(files, 0, lttng_dump_one_fd, &ctx);
+ iterate_fd(files, 0, lttng_dump_one_fd, &ctx);
}
#ifdef LTTNG_HAVE_STATEDUMP_CPU_TOPOLOGY
+++ /dev/null
-/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
- * wrapper/fdtable.c
- *
- * Copyright (C) 2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#include <lttng/kernel-version.h>
-#include <linux/spinlock.h>
-#include <wrapper/fdtable.h>
-
-#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(3,7,0))
-
-/*
- * Reimplementation of iterate_fd() for kernels between 2.6.32 and 3.6
- * (inclusive).
- */
-int lttng_iterate_fd(struct files_struct *files,
- unsigned int first,
- int (*cb)(const void *, struct file *, unsigned int),
- const void *ctx)
-{
- struct fdtable *fdt;
- struct file *filp;
- unsigned int i;
- int res = 0;
-
- if (!files)
- return 0;
- spin_lock(&files->file_lock);
- fdt = files_fdtable(files);
- for (i = 0; i < fdt->max_fds; i++) {
- filp = fcheck_files(files, i);
- if (!filp)
- continue;
- res = cb(ctx, filp, i);
- if (res)
- break;
- }
- spin_unlock(&files->file_lock);
- return res;
-}
-
-#endif