X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=blobdiff_plain;f=lttng-statedump-impl.c;h=1c09e51a8ce6a454b4bb8c86b3e079789cc9cfcd;hp=d4f29fd397bc69e53c18803a434ed8adaac95880;hb=ea15538d675ad5685c1e4ce1c393f25f682eb06b;hpb=e1d0406d1314c8c62aaea6619249150be8b1c4b7

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index d4f29fd3..1c09e51a 100644
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -47,15 +47,16 @@
 #include <linux/mutex.h>
 #include <linux/device.h>
 
-#include "lttng-events.h"
-#include "lttng-tracer.h"
-#include "wrapper/irqdesc.h"
-#include "wrapper/spinlock.h"
-#include "wrapper/fdtable.h"
-#include "wrapper/nsproxy.h"
-#include "wrapper/irq.h"
-#include "wrapper/tracepoint.h"
-#include "wrapper/genhd.h"
+#include <lttng-events.h>
+#include <lttng-tracer.h>
+#include <wrapper/irqdesc.h>
+#include <wrapper/spinlock.h>
+#include <wrapper/fdtable.h>
+#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>
@@ -63,10 +64,10 @@
 
 /* Define the tracepoints, but do not build the probes */
 #define CREATE_TRACE_POINTS
-#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module
+#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module
 #define TRACE_INCLUDE_FILE lttng-statedump
 #define LTTNG_INSTRUMENTATION
-#include "instrumentation/events/lttng-module/lttng-statedump.h"
+#include <instrumentation/events/lttng-module/lttng-statedump.h>
 
 DEFINE_TRACE(lttng_statedump_block_device);
 DEFINE_TRACE(lttng_statedump_end);
@@ -214,18 +215,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 +316,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);
@@ -402,37 +391,14 @@ void lttng_statedump_process_ns(struct lttng_session *session,
 		enum lttng_execution_submode submode,
 		enum lttng_process_status status)
 {
-	struct nsproxy *proxy;
 	struct pid_namespace *pid_ns;
 
-	/*
-	 * Back and forth on locking strategy within Linux upstream for nsproxy.
-	 * See Linux upstream commit 728dba3a39c66b3d8ac889ddbe38b5b1c264aec3
-	 * "namespaces: Use task_lock and not rcu to protect nsproxy"
-	 * for details.
-	 */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0))
-	proxy = p->nsproxy;
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)) */
-	rcu_read_lock();
-	proxy = task_nsproxy(p);
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)) */
-	if (proxy) {
-		pid_ns = lttng_get_proxy_pid_ns(proxy);
-		do {
-			trace_lttng_statedump_process_state(session,
-				p, type, mode, submode, status, pid_ns);
-			pid_ns = pid_ns->parent;
-		} while (pid_ns);
-	} else {
+	pid_ns = task_active_pid_ns(p);
+	do {
 		trace_lttng_statedump_process_state(session,
-			p, type, mode, submode, status, NULL);
-	}
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0))
-	/* (nothing) */
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)) */
-	rcu_read_unlock();
-#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)) */
+			p, type, mode, submode, status, pid_ns);
+		pid_ns = pid_ns->parent;
+	} while (pid_ns);
 }
 
 static
@@ -528,6 +494,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;