X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Flttng-statedump.h;h=6e2dd9e76d275494c69fe90ca5a749d34e639a4a;hb=6388029c11796f2416f772c1f9aca2ec925774e2;hp=f8f10e7cab13d63547c4cbf764b16f9d040b4ccb;hpb=4b4a8b1980b91b11e6d3b628f7285906fa46c676;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/lttng-statedump.h b/instrumentation/events/lttng-module/lttng-statedump.h
index f8f10e7c..6e2dd9e7 100644
--- a/instrumentation/events/lttng-module/lttng-statedump.h
+++ b/instrumentation/events/lttng-module/lttng-statedump.h
@@ -15,7 +15,6 @@
 #include <linux/utsname.h>
 #include <linux/types.h>
 #include <linux/version.h>
-#include <wrapper/namespace.h>
 #include <wrapper/user_namespace.h>
 
 #ifndef LTTNG_MNT_NS_MISSING_HEADER
@@ -73,7 +72,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
@@ -86,7 +85,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_ipc_ns,
 	TP_FIELDS(
 		ctf_integer(pid_t, tid, p->pid)
 #if (LINUX_VERSION_CODE >= 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
 	)
 )
@@ -100,7 +99,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_mnt_ns,
 	TP_FIELDS(
 		ctf_integer(pid_t, tid, p->pid)
 #if (LINUX_VERSION_CODE >= 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
 	)
 )
@@ -114,7 +113,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_net_ns,
 	TP_FIELDS(
 		ctf_integer(pid_t, tid, p->pid)
 #if (LINUX_VERSION_CODE >= 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
 	)
 )
@@ -143,7 +142,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_pid_ns,
 			}))
 		ctf_integer(int, ns_level, pid_ns ? pid_ns->level : 0)
 #if (LINUX_VERSION_CODE >= 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
 	)
 )
@@ -161,7 +160,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_user_ns,
 		ctf_integer(int, ns_level, user_ns ? user_ns->level : 0)
 #endif
 #if (LINUX_VERSION_CODE >= 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
 	)
 )
@@ -174,7 +173,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_uts_ns,
 	TP_FIELDS(
 		ctf_integer(pid_t, tid, p->pid)
 #if (LINUX_VERSION_CODE >= 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
 	)
 )