X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-statedump-impl.c;h=2828b1908d75d684aef7e6f9e7b10a1ea7987856;hb=dd970ee8196b857ce89278a55b7ac471593dc95d;hp=a2520433216f0f79d5a502cf5dbb4389222a7d0a;hpb=727a94c8396290a7bfde674180f38fcc989a883a;p=lttng-modules.git

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index a2520433..2828b190 100644
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -41,7 +41,6 @@
 #include <linux/inetdevice.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/fdtable.h>
 #include <linux/swap.h>
 #include <linux/wait.h>
 #include <linux/mutex.h>
@@ -52,12 +51,11 @@
 #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 <wrapper/file.h>
-#include <wrapper/time.h>
+#include <wrapper/fdtable.h>
 
 #ifdef CONFIG_LTTNG_HAS_LIST_IRQ
 #include <linux/irq.h>
@@ -392,43 +390,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) || \
-		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) {
-		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) || \
-		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
+			p, type, mode, submode, status, pid_ns);
+		pid_ns = pid_ns ? pid_ns->parent : NULL;
+	} while (pid_ns);
 }
 
 static