Rename "tsc" to "timestamp"

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

diff --git a/src/lttng-context-suid.c b/src/lttng-context-suid.c
index 4d9b5af34ff74d07cfef20396cede5b69baa1d06..a478b7bf78e7d6fd878b2cace6ea2d597ae675ed 100644 (file)
--- a/src/lttng-context-suid.c
+++ b/src/lttng-context-suid.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 suid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
@@ -31,13 +32,12 @@ size_t suid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_
 static
 void suid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
                 struct lttng_kernel_ring_buffer_ctx *ctx,
-                struct lttng_channel *chan)
+                struct lttng_kernel_channel_buffer *chan)
 {
        uid_t suid;
 
-       suid = lttng_current_suid();
-       lib_ring_buffer_align_ctx(ctx, lttng_alignof(suid));
-       chan->ops->event_write(ctx, &suid, sizeof(suid));
+       suid = from_kuid_munged(&init_user_ns, current_suid());
+       chan->ops->event_write(ctx, &suid, sizeof(suid), lttng_alignof(suid));
 }
 
 static
@@ -45,13 +45,13 @@ void suid_get_value(void *priv,
                struct lttng_kernel_probe_ctx *lttng_probe_ctx,
                struct lttng_ctx_value *value)
 {
-       value->u.s64 = lttng_current_suid();
+       value->u.s64 = from_kuid_munged(&init_user_ns, current_suid());
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
        lttng_kernel_static_event_field("suid",
                lttng_kernel_static_type_integer_from_type(uid_t, __BYTE_ORDER, 10),
-               false, false, false),
+               false, false),
        suid_get_size,
        suid_record,
        suid_get_value,