X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-statedump-impl.c;h=07ffbf7f461f6397dcb2a3218585e409ac317e52;hb=46e25482873e8c85b547db4cec1734f127b27488;hp=b60531d507020bdbf26e8f7cac1b95f48d101663;hpb=e7a0ca7205fd4be7c829d171baa8823fe4784c90;p=lttng-modules.git

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index b60531d5..07ffbf7f 100644
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
  *
  * lttng-statedump.c
  *
@@ -32,21 +32,13 @@
 #include <linux/wait.h>
 #include <linux/mutex.h>
 #include <linux/device.h>
+#include <linux/fdtable.h>
+#include <linux/irq.h>
 
 #include <lttng-events.h>
 #include <lttng-tracer.h>
-#include <wrapper/irqdesc.h>
-#include <wrapper/fdtable.h>
 #include <wrapper/namespace.h>
-#include <wrapper/irq.h>
-#include <wrapper/tracepoint.h>
 #include <wrapper/genhd.h>
-#include <wrapper/file.h>
-#include <wrapper/fdtable.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
@@ -237,7 +229,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;
@@ -264,7 +256,7 @@ void lttng_enumerate_files(struct lttng_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
@@ -313,7 +305,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);
@@ -337,8 +329,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)
 {
@@ -346,7 +336,6 @@ int lttng_list_interrupts(struct lttng_session *session)
 	unsigned long flags = 0;
 	struct irq_desc *desc;
 
-#define irq_to_desc	wrapper_irq_to_desc
 	/* needs irq_desc */
 	for_each_irq_desc(irq, desc) {
 		struct irqaction *action;
@@ -363,15 +352,7 @@ int lttng_list_interrupts(struct lttng_session *session)
 		local_irq_restore(flags);
 	}
 	return 0;
-#undef irq_to_desc
-}
-#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
@@ -619,13 +600,6 @@ EXPORT_SYMBOL_GPL(lttng_statedump_start);
 static
 int __init lttng_statedump_init(void)
 {
-	/*
-	 * Allow module to load even if the fixup cannot be done. This
-	 * will allow seemless transition when the underlying issue fix
-	 * is merged into the Linux kernel, and when tracepoint.c
-	 * "tracepoint_module_notify" is turned into a static function.
-	 */
-	(void) wrapper_lttng_fixup_sig(THIS_MODULE);
 	return 0;
 }