X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=blobdiff_plain;f=src%2Flttng-context-vuid.c;h=e83f8989d456cf44d909ca6c6d36e90440760f2a;hp=2ecc411e373d1f42d4ccee12899e097b69b958b3;hb=HEAD;hpb=a92e844e9e4cc9d5c4a7ec3d1c0738d375430446

diff --git a/src/lttng-context-vuid.c b/src/lttng-context-vuid.c
index 2ecc411e..3fbee8aa 100644
--- 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)
@@ -30,14 +31,13 @@ size_t vuid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_
 
 static
 void vuid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-		 struct lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+		 struct lttng_kernel_ring_buffer_ctx *ctx,
+		 struct lttng_kernel_channel_buffer *chan)
 {
 	uid_t vuid;
 
-	vuid = lttng_current_vuid();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(vuid));
-	chan->ops->event_write(ctx, &vuid, sizeof(vuid));
+	vuid = from_kuid_munged(current_user_ns(), current_uid());
+	chan->ops->event_write(ctx, &vuid, sizeof(vuid), lttng_alignof(vuid));
 }
 
 static
@@ -45,13 +45,13 @@ 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(
 	lttng_kernel_static_event_field("vuid",
 		lttng_kernel_static_type_integer_from_type(uid_t, __BYTE_ORDER, 10),
-		false, false, false),
+		false, false),
 	vuid_get_size,
 	vuid_record,
 	vuid_get_value,