From 13393162ec7881c952ed9f7f98ecce810fdd8093 Mon Sep 17 00:00:00 2001 From: Julien Desfossez Date: Wed, 1 Oct 2014 11:05:11 -0400 Subject: [PATCH] Fix: compile lttng_statedump_process_ns on Ubuntu Fixes: #838 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 6bdbb596..d2cf8a3f 100644 --- a/lttng-statedump-impl.c +++ b/lttng-statedump-impl.c @@ -410,12 +410,13 @@ 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) || \ + LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0)) proxy = p->nsproxy; -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)) */ +#else rcu_read_lock(); proxy = task_nsproxy(p); -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)) */ +#endif if (proxy) { pid_ns = lttng_get_proxy_pid_ns(proxy); do { @@ -427,11 +428,12 @@ 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) || \ + LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0)) /* (nothing) */ -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)) */ +#else rcu_read_unlock(); -#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)) */ +#endif } static -- 2.34.1