From cc58956cca1b3864a02b80882ead818b23225295 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 9 Apr 2020 11:33:48 -0400 Subject: [PATCH] Cleanup: use DEFINE_URCU_TLS_INIT for all CONFIG_RCU_TLS configurations Introduce a dependency on DEFINE_URCU_TLS_INIT for all CONFIG_RCU_TLS configurations. Signed-off-by: Mathieu Desnoyers --- liblttng-ust/lttng-context-cgroup-ns.c | 4 ---- liblttng-ust/lttng-context-ipc-ns.c | 4 ---- liblttng-ust/lttng-context-net-ns.c | 4 ---- liblttng-ust/lttng-context-uts-ns.c | 4 ---- 4 files changed, 16 deletions(-) diff --git a/liblttng-ust/lttng-context-cgroup-ns.c b/liblttng-ust/lttng-context-cgroup-ns.c index cd9e2bc1..a6aca3ab 100644 --- a/liblttng-ust/lttng-context-cgroup-ns.c +++ b/liblttng-ust/lttng-context-cgroup-ns.c @@ -39,11 +39,7 @@ * We cache the result to ensure we don't stat(2) the proc filesystem on * each event. */ -#ifdef CONFIG_RCU_TLS -static DEFINE_URCU_TLS(ino_t, cached_cgroup_ns) = NS_INO_UNINITIALIZED; -#else static DEFINE_URCU_TLS_INIT(ino_t, cached_cgroup_ns, NS_INO_UNINITIALIZED); -#endif static ino_t get_cgroup_ns(void) diff --git a/liblttng-ust/lttng-context-ipc-ns.c b/liblttng-ust/lttng-context-ipc-ns.c index 9890b03b..029ba087 100644 --- a/liblttng-ust/lttng-context-ipc-ns.c +++ b/liblttng-ust/lttng-context-ipc-ns.c @@ -38,11 +38,7 @@ * We cache the result to ensure we don't stat(2) the proc filesystem on * each event. */ -#ifdef CONFIG_RCU_TLS -static DEFINE_URCU_TLS(ino_t, cached_ipc_ns) = NS_INO_UNINITIALIZED; -#else static DEFINE_URCU_TLS_INIT(ino_t, cached_ipc_ns, NS_INO_UNINITIALIZED); -#endif static ino_t get_ipc_ns(void) diff --git a/liblttng-ust/lttng-context-net-ns.c b/liblttng-ust/lttng-context-net-ns.c index c1ae9796..3ce139f6 100644 --- a/liblttng-ust/lttng-context-net-ns.c +++ b/liblttng-ust/lttng-context-net-ns.c @@ -38,11 +38,7 @@ * We cache the result to ensure we don't stat(2) the proc filesystem on * each event. */ -#ifdef CONFIG_RCU_TLS -static DEFINE_URCU_TLS(ino_t, cached_net_ns) = NS_INO_UNINITIALIZED; -#else static DEFINE_URCU_TLS_INIT(ino_t, cached_net_ns, NS_INO_UNINITIALIZED); -#endif static ino_t get_net_ns(void) diff --git a/liblttng-ust/lttng-context-uts-ns.c b/liblttng-ust/lttng-context-uts-ns.c index 77bb21bc..13b7a469 100644 --- a/liblttng-ust/lttng-context-uts-ns.c +++ b/liblttng-ust/lttng-context-uts-ns.c @@ -39,11 +39,7 @@ * We cache the result to ensure we don't stat(2) the proc filesystem on * each event. */ -#ifdef CONFIG_RCU_TLS -static DEFINE_URCU_TLS(ino_t, cached_uts_ns) = NS_INO_UNINITIALIZED; -#else static DEFINE_URCU_TLS_INIT(ino_t, cached_uts_ns, NS_INO_UNINITIALIZED); -#endif static ino_t get_uts_ns(void) -- 2.34.1