X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-context-user-ns.c;h=ab9afa4edade5c9fe47cfb52cb3cfc37e81e7385;hb=93e5bcec1d8d550a1983bbc013248dbd83573cc7;hp=ae674667248c2129a6f139e1f061a2b94c0c171a;hpb=8a57ec025ffbe56153748fd69b60118862707182;p=lttng-modules.git

diff --git a/src/lttng-context-user-ns.c b/src/lttng-context-user-ns.c
index ae674667..ab9afa4e 100644
--- a/src/lttng-context-user-ns.c
+++ b/src/lttng-context-user-ns.c
@@ -17,7 +17,6 @@
 #include <lttng/events-internal.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
-#include <wrapper/namespace.h>
 #include <lttng/tracer.h>
 
 #if defined(CONFIG_USER_NS) && \
@@ -36,15 +35,14 @@ size_t user_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, si
 static
 void user_ns_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)
 {
 	unsigned int user_ns_inum = 0;
 
 	if (current_user_ns())
-		user_ns_inum = current_user_ns()->lttng_ns_inum;
+		user_ns_inum = current_user_ns()->ns.inum;
 
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(user_ns_inum));
-	chan->ops->event_write(ctx, &user_ns_inum, sizeof(user_ns_inum));
+	chan->ops->event_write(ctx, &user_ns_inum, sizeof(user_ns_inum), lttng_alignof(user_ns_inum));
 }
 
 static
@@ -55,7 +53,7 @@ void user_ns_get_value(void *priv,
 	unsigned int user_ns_inum = 0;
 
 	if (current_user_ns())
-		user_ns_inum = current_user_ns()->lttng_ns_inum;
+		user_ns_inum = current_user_ns()->ns.inum;
 
 	value->u.s64 = user_ns_inum;
 }
@@ -63,7 +61,7 @@ void user_ns_get_value(void *priv,
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
 	lttng_kernel_static_event_field("user_ns",
 		lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10),
-		false, false, false),
+		false, false),
 	user_ns_get_size,
 	user_ns_record,
 	user_ns_get_value,