Rename "tsc" to "timestamp"

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

diff --git a/src/lttng-context-uid.c b/src/lttng-context-uid.c
index b4b5b6ce4acf2c5c3ed3c152c937273f1de8b400..da8fb301b9a1da4b9bf618096cdeb9329474cb1c 100644 (file)
--- a/src/lttng-context-uid.c
+++ b/src/lttng-context-uid.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 uid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
@@ -35,7 +36,7 @@ void uid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
 {
        uid_t uid;
 
-       uid = lttng_current_uid();
+       uid = from_kuid_munged(&init_user_ns, current_uid());
        chan->ops->event_write(ctx, &uid, sizeof(uid), lttng_alignof(uid));
 }
 
@@ -44,13 +45,13 @@ void uid_get_value(void *priv,
                struct lttng_kernel_probe_ctx *lttng_probe_ctx,
                struct lttng_ctx_value *value)
 {
-       value->u.s64 = lttng_current_uid();
+       value->u.s64 = from_kuid_munged(&init_user_ns, current_uid());
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
        lttng_kernel_static_event_field("uid",
                lttng_kernel_static_type_integer_from_type(uid_t, __BYTE_ORDER, 10),
-               false, false, false),
+               false, false),
        uid_get_size,
        uid_record,
        uid_get_value,