X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-statedump-impl.c;h=e0d74f6f9e5b257a0636e0b9bebad94b962b7209;hb=cb8a2195d6935368ff931913acb76ba5e8a6d9a6;hp=656cebb26ba635fe141f0c7f0badde761be6b5a3;hpb=aa29f2d33bae1396b7bd4766b7442ca780fa712e;p=lttng-modules.git diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c index 656cebb2..e0d74f6f 100644 --- a/lttng-statedump-impl.c +++ b/lttng-statedump-impl.c @@ -411,12 +411,14 @@ 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) || \ + LTTNG_UBUNTU_KERNEL_RANGE(3,16,0,11, 3,17,0,0)) + proxy = p->nsproxy; +#else 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 if (proxy) { pid_ns = lttng_get_proxy_pid_ns(proxy); do { @@ -428,9 +430,13 @@ 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) || \ + LTTNG_UBUNTU_KERNEL_RANGE(3,16,0,11, 3,17,0,0)) + /* (nothing) */ +#else rcu_read_unlock(); -#endif /* #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */ +#endif } static