Drop support for kernels < 4.4 from 'wrapper/fdtable.h'

[lttng-modules.git] / src / lttng-statedump-impl.c

diff --git a/src/lttng-statedump-impl.c b/src/lttng-statedump-impl.c
index 95032f87a2db4f2cefa0a4bcf31a9b61c41ccb48..9d708af9f751b59286292ff6a7edfa17735e7a08 100644 (file)
--- a/src/lttng-statedump-impl.c
+++ b/src/lttng-statedump-impl.c
@@ -39,7 +39,6 @@
 #include <wrapper/cpu.h>
 #include <wrapper/irqdesc.h>
 #include <wrapper/fdtable.h>
-#include <wrapper/namespace.h>
 #include <wrapper/tracepoint.h>
 #include <wrapper/blkdev.h>
 #include <wrapper/fdtable.h>
@@ -429,7 +428,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 && 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;
@@ -456,7 +455,7 @@ void lttng_enumerate_files(struct lttng_kernel_session *session,
 {
        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
@@ -599,7 +598,7 @@ void lttng_statedump_process_ns(struct lttng_kernel_session *session,
                 * paranoid behavior of
                 * trace_lttng_statedump_process_user_ns().
                 */
-               user_ns = user_ns ? user_ns->lttng_user_ns_parent : NULL;
+               user_ns = user_ns ? user_ns->parent : NULL;
        } while (user_ns);
 
        /*