From: Julien Desfossez <jdesfossez@efficios.com>
Date: Wed, 1 Oct 2014 15:05:10 +0000 (-0400)
Subject: Reverse version check logic in lttng_statedump_process_ns
X-Git-Tag: v2.6.0-rc1~13
X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=commitdiff_plain;h=e1d0406d1314c8c62aaea6619249150be8b1c4b7

Reverse version check logic in lttng_statedump_process_ns

This allows to keep the most up-to-date branch on top.

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index 656cebb2..d4f29fd3 100644
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -411,12 +411,12 @@ 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))
+#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);
-#else /* #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */
-	proxy = p->nsproxy;
-#endif /* #else #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)) */
 	if (proxy) {
 		pid_ns = lttng_get_proxy_pid_ns(proxy);
 		do {
@@ -428,9 +428,11 @@ void lttng_statedump_process_ns(struct lttng_session *session,
 		trace_lttng_statedump_process_state(session,
 			p, type, mode, submode, status, NULL);
 	}
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0))
+#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)) */
+#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)) */
 }
 
 static