X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-context-gid.c;h=24692aace159500788138df7b3e09b18a98621fd;hb=6687229729b31254fa5774f39ee2d768618b3172;hp=6d6110885416c5aa5abbf525cc5423f56d6ce36b;hpb=a92e844e9e4cc9d5c4a7ec3d1c0738d375430446;p=lttng-modules.git

diff --git a/src/lttng-context-gid.c b/src/lttng-context-gid.c
index 6d611088..24692aac 100644
--- a/src/lttng-context-gid.c
+++ b/src/lttng-context-gid.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 gid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
@@ -30,14 +31,13 @@ size_t gid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t
 
 static
 void gid_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)
 {
 	gid_t gid;
 
-	gid = lttng_current_gid();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(gid));
-	chan->ops->event_write(ctx, &gid, sizeof(gid));
+	gid = from_kgid_munged(&init_user_ns, current_gid());
+	chan->ops->event_write(ctx, &gid, sizeof(gid), lttng_alignof(gid));
 }
 
 static
@@ -45,13 +45,13 @@ void gid_get_value(void *priv,
 		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
 		struct lttng_ctx_value *value)
 {
-	value->u.s64 = lttng_current_gid();
+	value->u.s64 = from_kgid_munged(&init_user_ns, current_gid());
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
 	lttng_kernel_static_event_field("gid",
 		lttng_kernel_static_type_integer_from_type(gid_t, __BYTE_ORDER, 10),
-		false, false, false),
+		false, false),
 	gid_get_size,
 	gid_record,
 	gid_get_value,