X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flttng-context-vuid.c;h=3fbee8aac783ea2ff02a2cc3ae06f9b622f200cf;hb=fb4b909790d4baf3e9971aca8e4ee8b3150098f6;hp=e3c946c910f1058f21c2858e7405167cbc20e2c7;hpb=2dc781e02eb156a76554ada092a181ab2916db57;p=lttng-modules.git

diff --git a/src/lttng-context-vuid.c b/src/lttng-context-vuid.c
index e3c946c9..3fbee8aa 100644
--- a/src/lttng-context-vuid.c
+++ b/src/lttng-context-vuid.c
@@ -11,15 +11,16 @@
 
 #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_probe_ctx *probe_ctx, size_t offset)
+size_t vuid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
 	size_t size = 0;
 
@@ -29,29 +30,28 @@ size_t vuid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offse
 }
 
 static
-void vuid_record(void *priv, struct lttng_probe_ctx *probe_ctx,
-		 struct lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+void vuid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
+		 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
 void vuid_get_value(void *priv,
-		struct lttng_probe_ctx *lttng_probe_ctx,
+		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,