From e1d0406d1314c8c62aaea6619249150be8b1c4b7 Mon Sep 17 00:00:00 2001 From: Julien Desfossez Date: Wed, 1 Oct 2014 11:05:10 -0400 Subject: [PATCH] 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 Signed-off-by: Mathieu Desnoyers --- lttng-statedump-impl.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 -- 2.34.1