X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-user-ns.c;h=53303d0f4305311b47f2c2be43d37e5467a3852d;hb=2208d8b5689264e35ed0a660d8c3c82021cc0367;hp=464e7368a084ff8cbf28441a4da1ad5ac22e6485;hpb=eae3c72949135b48639440468dc78ea1d5e937e9;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-user-ns.c b/liblttng-ust/lttng-context-user-ns.c
index 464e7368..53303d0f 100644
--- a/liblttng-ust/lttng-context-user-ns.c
+++ b/liblttng-ust/lttng-context-user-ns.c
@@ -8,6 +8,7 @@
  */
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -72,29 +73,29 @@ void lttng_context_user_ns_reset(void)
 }
 
 static
-size_t user_ns_get_size(struct lttng_ust_ctx_field *field, size_t offset)
+size_t user_ns_get_size(struct lttng_ust_ctx_field *field __attribute__((unused)),
+		size_t offset)
 {
 	size_t size = 0;
 
-	size += lib_ring_buffer_align(offset, lttng_alignof(ino_t));
+	size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(ino_t));
 	size += sizeof(ino_t);
 	return size;
 }
 
 static
-void user_ns_record(struct lttng_ust_ctx_field *field,
+void user_ns_record(struct lttng_ust_ctx_field *field __attribute__((unused)),
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
 		 struct lttng_ust_channel_buffer *chan)
 {
 	ino_t user_ns;
 
 	user_ns = get_user_ns();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(user_ns));
-	chan->ops->event_write(ctx, &user_ns, sizeof(user_ns));
+	chan->ops->event_write(ctx, &user_ns, sizeof(user_ns), lttng_ust_rb_alignof(user_ns));
 }
 
 static
-void user_ns_get_value(struct lttng_ust_ctx_field *field,
+void user_ns_get_value(struct lttng_ust_ctx_field *field __attribute__((unused)),
 		struct lttng_ust_ctx_value *value)
 {
 	value->u.s64 = get_user_ns();
@@ -107,7 +108,7 @@ int lttng_add_user_ns_to_ctx(struct lttng_ust_ctx **ctx)
 	int ret;
 
 	type = lttng_ust_create_type_integer(sizeof(ino_t) * CHAR_BIT,
-			lttng_alignof(ino_t) * CHAR_BIT,
+			lttng_ust_rb_alignof(ino_t) * CHAR_BIT,
 			lttng_ust_is_signed_type(ino_t),
 			BYTE_ORDER, 10);
 	if (!type)