X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-statedump-impl.c;h=fcbdfa58e99427b03456af07d080bec985f2e9f2;hb=9e8bcbf975844986f021e99e2a30ceedc41b46a8;hp=e0d74f6f9e5b257a0636e0b9bebad94b962b7209;hpb=a5c47aa6bbdbe53efb15afb608173193cffcab3d;p=lttng-modules.git diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c index e0d74f6f..fcbdfa58 100644 --- a/lttng-statedump-impl.c +++ b/lttng-statedump-impl.c @@ -56,6 +56,8 @@ #include "wrapper/irq.h" #include "wrapper/tracepoint.h" #include "wrapper/genhd.h" +#include "wrapper/file.h" +#include "wrapper/time.h" #ifdef CONFIG_LTTNG_HAS_LIST_IRQ #include @@ -214,18 +216,6 @@ 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) { @@ -327,7 +317,7 @@ void lttng_enumerate_task_vm_maps(struct lttng_session *session, down_read(&mm->mmap_sem); while (map) { if (map->vm_file) - ino = map->vm_file->f_dentry->d_inode->i_ino; + ino = map->vm_file->lttng_f_dentry->d_inode->i_ino; else ino = 0; trace_lttng_statedump_vm_map(session, p, map, ino);