X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-statedump-impl.c;h=657031ec9e535990683d37c24bbb64ae6e75ced0;hb=45ce950feda732e773bdeebeb6d6450989a8d48d;hp=eefc0b8fb2f11525d5c9befad3a7d2ba5f3c0e01;hpb=0d260d3d3e28849772a060a9b1374712c0959fca;p=lttng-modules.git

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index eefc0b8f..657031ec 100644
--- 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
@@ -120,19 +114,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 +137,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 +296,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 +320,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 +344,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 +388,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);
 
 	/*