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 656cebb26ba635fe141f0c7f0badde761be6b5a3..d4f29fd397bc69e53c18803a434ed8adaac95880 100644 (file)
--- 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