Rename "tsc" to "timestamp"

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

diff --git a/src/lttng-context-veuid.c b/src/lttng-context-veuid.c
index 9113578e2bd76f855d59925f8a5af0e030972491..8fc593e56980573f2816c6561230830bdbd12f0f 100644 (file)
--- a/src/lttng-context-veuid.c
+++ b/src/lttng-context-veuid.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 veuid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
@@ -35,9 +36,8 @@ void veuid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
 {
        uid_t veuid;
 
-       veuid = lttng_current_veuid();
-       lib_ring_buffer_align_ctx(ctx, lttng_alignof(veuid));
-       chan->ops->event_write(ctx, &veuid, sizeof(veuid));
+       veuid = from_kuid_munged(current_user_ns(), current_euid());
+       chan->ops->event_write(ctx, &veuid, sizeof(veuid), lttng_alignof(veuid));
 }
 
 static
@@ -45,13 +45,13 @@ void veuid_get_value(void *priv,
                struct lttng_kernel_probe_ctx *lttng_probe_ctx,
                struct lttng_ctx_value *value)
 {
-       value->u.s64 = lttng_current_veuid();
+       value->u.s64 = from_kuid_munged(current_user_ns(), current_euid());
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
        lttng_kernel_static_event_field("veuid",
                lttng_kernel_static_type_integer_from_type(uid_t, __BYTE_ORDER, 10),
-               false, false, false),
+               false, false),
        veuid_get_size,
        veuid_record,
        veuid_get_value,