X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Finstrumentation%2Fevents%2Flttng-statedump.h;h=e88fec575aa2cf38e97058c7d8b254c635148bc9;hb=93e5bcec1d8d550a1983bbc013248dbd83573cc7;hp=cc835e292341b26af900940c1003d000454ff531;hpb=8cdc1a8180681ebd144f8c0009e76cdc7331b36a;p=lttng-modules.git

diff --git a/include/instrumentation/events/lttng-statedump.h b/include/instrumentation/events/lttng-statedump.h
index cc835e29..e88fec57 100644
--- a/include/instrumentation/events/lttng-statedump.h
+++ b/include/instrumentation/events/lttng-statedump.h
@@ -15,9 +15,9 @@
 #include <linux/utsname.h>
 #include <linux/types.h>
 #include <lttng/kernel-version.h>
-#include <wrapper/namespace.h>
 #include <wrapper/user_namespace.h>
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0) || \
+	LTTNG_RHEL_KERNEL_RANGE(4,18,0,305,0,0, 4,19,0,0,0,0))
 #include <linux/time_namespace.h>
 #endif
 
@@ -76,7 +76,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_cgroup_ns,
 	TP_ARGS(session, p, cgroup_ns),
 	TP_FIELDS(
 		ctf_integer(pid_t, tid, p->pid)
-		ctf_integer(unsigned int, ns_inum, cgroup_ns ? cgroup_ns->lttng_ns_inum : 0)
+		ctf_integer(unsigned int, ns_inum, cgroup_ns ? cgroup_ns->ns.inum : 0)
 	)
 )
 #endif
@@ -89,7 +89,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_ipc_ns,
 	TP_FIELDS(
 		ctf_integer(pid_t, tid, p->pid)
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
-		ctf_integer(unsigned int, ns_inum, ipc_ns ? ipc_ns->lttng_ns_inum : 0)
+		ctf_integer(unsigned int, ns_inum, ipc_ns ? ipc_ns->ns.inum : 0)
 #endif
 	)
 )
@@ -103,7 +103,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_mnt_ns,
 	TP_FIELDS(
 		ctf_integer(pid_t, tid, p->pid)
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
-		ctf_integer(unsigned int, ns_inum, mnt_ns ? mnt_ns->lttng_ns_inum : 0)
+		ctf_integer(unsigned int, ns_inum, mnt_ns ? mnt_ns->ns.inum : 0)
 #endif
 	)
 )
@@ -117,7 +117,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_net_ns,
 	TP_FIELDS(
 		ctf_integer(pid_t, tid, p->pid)
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
-		ctf_integer(unsigned int, ns_inum, net_ns ? net_ns->lttng_ns_inum : 0)
+		ctf_integer(unsigned int, ns_inum, net_ns ? net_ns->ns.inum : 0)
 #endif
 	)
 )
@@ -146,7 +146,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_pid_ns,
 			}))
 		ctf_integer(int, ns_level, pid_ns ? pid_ns->level : 0)
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
-		ctf_integer(unsigned int, ns_inum, pid_ns ? pid_ns->lttng_ns_inum : 0)
+		ctf_integer(unsigned int, ns_inum, pid_ns ? pid_ns->ns.inum : 0)
 #endif
 	)
 )
@@ -164,7 +164,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_user_ns,
 		ctf_integer(int, ns_level, user_ns ? user_ns->level : 0)
 #endif
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
-		ctf_integer(unsigned int, ns_inum, user_ns ? user_ns->lttng_ns_inum : 0)
+		ctf_integer(unsigned int, ns_inum, user_ns ? user_ns->ns.inum : 0)
 #endif
 	)
 )
@@ -177,12 +177,13 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_uts_ns,
 	TP_FIELDS(
 		ctf_integer(pid_t, tid, p->pid)
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
-		ctf_integer(unsigned int, ns_inum, uts_ns ? uts_ns->lttng_ns_inum : 0)
+		ctf_integer(unsigned int, ns_inum, uts_ns ? uts_ns->ns.inum : 0)
 #endif
 	)
 )
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0) || \
+	LTTNG_RHEL_KERNEL_RANGE(4,18,0,305,0,0, 4,19,0,0,0,0))
 LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_time_ns,
 	TP_PROTO(struct lttng_kernel_session *session,
 		struct task_struct *p,
@@ -190,7 +191,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_time_ns,
 	TP_ARGS(session, p, time_ns),
 	TP_FIELDS(
 		ctf_integer(pid_t, tid, p->pid)
-		ctf_integer(unsigned int, ns_inum, time_ns ? time_ns->lttng_ns_inum : 0)
+		ctf_integer(unsigned int, ns_inum, time_ns ? time_ns->ns.inum : 0)
 	)
 )
 #endif