Version 2.7.7

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

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index e0d74f6f9e5b257a0636e0b9bebad94b962b7209..32f0e099a8884c3f66196af02f7ea17ec419099d 100644 (file)
--- 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 <linux/irq.h>
@@ -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);
@@ -413,7 +403,8 @@ void lttng_statedump_process_ns(struct lttng_session *session,
         */
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) || \
                LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \
-               LTTNG_UBUNTU_KERNEL_RANGE(3,16,0,11, 3,17,0,0))
+               LTTNG_UBUNTU_KERNEL_RANGE(3,16,1,11, 3,17,0,0) || \
+               LTTNG_RHEL_KERNEL_RANGE(3,10,0,229,13,0, 3,11,0,0,0,0))
        proxy = p->nsproxy;
 #else
        rcu_read_lock();
@@ -432,7 +423,8 @@ void lttng_statedump_process_ns(struct lttng_session *session,
        }
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) || \
                LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \
-               LTTNG_UBUNTU_KERNEL_RANGE(3,16,0,11, 3,17,0,0))
+               LTTNG_UBUNTU_KERNEL_RANGE(3,16,1,11, 3,17,0,0) || \
+               LTTNG_RHEL_KERNEL_RANGE(3,10,0,229,13,0, 3,11,0,0,0,0))
        /* (nothing) */
 #else
        rcu_read_unlock();
@@ -532,6 +524,8 @@ int do_lttng_statedump(struct lttng_session *session)
                return ret;
        ret = lttng_enumerate_block_devices(session);
        switch (ret) {
+       case 0:
+               break;
        case -ENOSYS:
                printk(KERN_WARNING "LTTng: block device enumeration is not supported by kernel\n");
                break;