ring buffer mmap: remove compatibility code

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

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index eefc0b8fb2f11525d5c9befad3a7d2ba5f3c0e01..4635feb05becab0a9d232f3a2bb8ade394836631 100644 (file)
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -33,17 +33,11 @@
 #include <linux/mutex.h>
 #include <linux/device.h>
 #include <linux/fdtable.h>
+#include <linux/irq.h>
+#include <linux/genhd.h>
 
 #include <lttng-events.h>
 #include <lttng-tracer.h>
-#include <wrapper/namespace.h>
-#include <wrapper/irq.h>
-#include <wrapper/genhd.h>
-#include <wrapper/file.h>
-
-#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
-#include <linux/irq.h>
-#endif
 
 /* Define the tracepoints, but do not build the probes */
 #define CREATE_TRACE_POINTS
@@ -59,9 +53,7 @@ DEFINE_TRACE(lttng_statedump_file_descriptor);
 DEFINE_TRACE(lttng_statedump_start);
 DEFINE_TRACE(lttng_statedump_process_state);
 DEFINE_TRACE(lttng_statedump_process_pid_ns);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0))
 DEFINE_TRACE(lttng_statedump_process_cgroup_ns);
-#endif
 DEFINE_TRACE(lttng_statedump_process_ipc_ns);
 #ifndef LTTNG_MNT_NS_MISSING_HEADER
 DEFINE_TRACE(lttng_statedump_process_mnt_ns);
@@ -120,19 +112,11 @@ enum lttng_process_status {
 static
 int lttng_enumerate_block_devices(struct lttng_session *session)
 {
-       struct class *ptr_block_class;
-       struct device_type *ptr_disk_type;
        struct class_dev_iter iter;
        struct device *dev;
 
-       ptr_block_class = wrapper_get_block_class();
-       if (!ptr_block_class)
-               return -ENOSYS;
-       ptr_disk_type = wrapper_get_disk_type();
-       if (!ptr_disk_type) {
-               return -ENOSYS;
-       }
-       class_dev_iter_init(&iter, ptr_block_class, NULL, ptr_disk_type);
+       class_dev_iter_init(&iter, gendisk_block_class(), NULL,
+                           gendisk_device_type());
        while ((dev = class_dev_iter_next(&iter))) {
                struct disk_part_iter piter;
                struct gendisk *disk = dev_to_disk(dev);
@@ -151,7 +135,7 @@ int lttng_enumerate_block_devices(struct lttng_session *session)
                        char name_buf[BDEVNAME_SIZE];
                        char *p;
 
-                       p = wrapper_disk_name(disk, part->partno, name_buf);
+                       p = gendisk_name(disk, part->partno, name_buf);
                        if (!p) {
                                disk_part_iter_exit(&piter);
                                class_dev_iter_exit(&iter);
@@ -310,7 +294,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->lttng_f_dentry->d_inode->i_ino;
+                               ino = map->vm_file->f_path.dentry->d_inode->i_ino;
                        else
                                ino = 0;
                        trace_lttng_statedump_vm_map(session, p, map, ino);
@@ -334,8 +318,6 @@ int lttng_enumerate_vm_maps(struct lttng_session *session)
 }
 #endif
 
-#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
-
 static
 int lttng_list_interrupts(struct lttng_session *session)
 {
@@ -360,13 +342,6 @@ int lttng_list_interrupts(struct lttng_session *session)
        }
        return 0;
 }
-#else
-static inline
-int lttng_list_interrupts(struct lttng_session *session)
-{
-       return 0;
-}
-#endif
 
 /*
  * Statedump the task's namespaces using the proc filesystem inode number as
@@ -411,7 +386,7 @@ void lttng_statedump_process_ns(struct lttng_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);
 
        /*
@@ -420,19 +395,9 @@ void lttng_statedump_process_ns(struct lttng_session *session,
         * "namespaces: Use task_lock and not rcu to protect nsproxy"
         * for details.
         */
-#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,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();
-       proxy = task_nsproxy(p);
-#endif
        if (proxy) {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0))
                trace_lttng_statedump_process_cgroup_ns(session, p, proxy->cgroup_ns);
-#endif
                trace_lttng_statedump_process_ipc_ns(session, p, proxy->ipc_ns);
 #ifndef LTTNG_MNT_NS_MISSING_HEADER
                trace_lttng_statedump_process_mnt_ns(session, p, proxy->mnt_ns);
@@ -440,14 +405,6 @@ void lttng_statedump_process_ns(struct lttng_session *session,
                trace_lttng_statedump_process_net_ns(session, p, proxy->net_ns);
                trace_lttng_statedump_process_uts_ns(session, p, proxy->uts_ns);
        }
-#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,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();
-#endif
 }
 
 static