Rename "tsc" to "timestamp"

[lttng-modules.git] / src / lttng-context-vuid.c

diff --git a/src/lttng-context-vuid.c b/src/lttng-context-vuid.c
index c76115f406536a61cac8f1f4558ccb0efbf9cd22..3fbee8aac783ea2ff02a2cc3ae06f9b622f200cf 100644 (file)
--- a/src/lttng-context-vuid.c
+++ b/src/lttng-context-vuid.c
@@ -11,12 +11,13 @@
 
 #include <linux/module.h>
 #include <linux/sched.h>
+#include <linux/user_namespace.h>
+
 #include <lttng/events.h>
 #include <lttng/events-internal.h>
 #include <lttng/tracer.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
-#include <wrapper/user_namespace.h>
 
 static
 size_t vuid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
@@ -35,7 +36,7 @@ void vuid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
 {
        uid_t vuid;
 
-       vuid = lttng_current_vuid();
+       vuid = from_kuid_munged(current_user_ns(), current_uid());
        chan->ops->event_write(ctx, &vuid, sizeof(vuid), lttng_alignof(vuid));
 }
 
@@ -44,7 +45,7 @@ void vuid_get_value(void *priv,
                struct lttng_kernel_probe_ctx *lttng_probe_ctx,
                struct lttng_ctx_value *value)
 {
-       value->u.s64 = lttng_current_vuid();
+       value->u.s64 = from_kuid_munged(current_user_ns(), current_uid());
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(