X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Finstrumentation%2Fevents%2Flttng-statedump.h;h=7bf79a796801e2b9bf1c3717bbee721aaf8ac5cb;hb=6d0471df5846249bd61278ff6191676cb075b871;hp=e88fec575aa2cf38e97058c7d8b254c635148bc9;hpb=853f5b15987181812b9973d86607cb9d76c850b9;p=lttng-modules.git

diff --git a/include/instrumentation/events/lttng-statedump.h b/include/instrumentation/events/lttng-statedump.h
index e88fec57..7bf79a79 100644
--- a/include/instrumentation/events/lttng-statedump.h
+++ b/include/instrumentation/events/lttng-statedump.h
@@ -14,8 +14,10 @@
 #include <linux/user_namespace.h>
 #include <linux/utsname.h>
 #include <linux/types.h>
+#include <linux/user_namespace.h>
+
 #include <lttng/kernel-version.h>
-#include <wrapper/user_namespace.h>
+
 #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>
@@ -158,8 +160,8 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_user_ns,
 	TP_ARGS(session, p, user_ns),
 	TP_FIELDS(
 		ctf_integer(pid_t, tid, p->pid)
-		ctf_integer(uid_t, vuid, user_ns ? lttng_task_vuid(p, user_ns) : 0)
-		ctf_integer(gid_t, vgid, user_ns ? lttng_task_vgid(p, user_ns) : 0)
+		ctf_integer(uid_t, vuid, user_ns ? from_kuid_munged(user_ns, task_cred_xxx(p, uid)) : 0)
+		ctf_integer(gid_t, vgid, user_ns ? from_kgid_munged(user_ns, task_cred_xxx(p, gid)) : 0)
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,11,0))
 		ctf_integer(int, ns_level, user_ns ? user_ns->level : 0)
 #endif