Rename "tsc" to "timestamp"

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

diff --git a/src/lttng-context-vsgid.c b/src/lttng-context-vsgid.c
index eb051f27a2763baa684a44112219370230fe4ddd..f54288652f9cf520947a745a43157a85a415a305 100644 (file)
--- a/src/lttng-context-vsgid.c
+++ b/src/lttng-context-vsgid.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 vsgid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
@@ -31,13 +32,12 @@ size_t vsgid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size
 static
 void vsgid_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)
 {
        gid_t vsgid;
 
-       vsgid = lttng_current_vsgid();
-       lib_ring_buffer_align_ctx(ctx, lttng_alignof(vsgid));
-       chan->ops->event_write(ctx, &vsgid, sizeof(vsgid));
+       vsgid = from_kgid_munged(current_user_ns(), current_sgid());
+       chan->ops->event_write(ctx, &vsgid, sizeof(vsgid), lttng_alignof(vsgid));
 }
 
 static
@@ -45,13 +45,13 @@ void vsgid_get_value(void *priv,
                struct lttng_kernel_probe_ctx *lttng_probe_ctx,
                struct lttng_ctx_value *value)
 {
-       value->u.s64 = lttng_current_vsgid();
+       value->u.s64 = from_kgid_munged(current_user_ns(), current_sgid());
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
        lttng_kernel_static_event_field("vsgid",
                lttng_kernel_static_type_integer_from_type(gid_t, __BYTE_ORDER, 10),
-               false, false, false),
+               false, false),
        vsgid_get_size,
        vsgid_record,
        vsgid_get_value,