X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-user-ns.c;h=3da97f0b1176990137c4f48ff7b652ee639ac71d;hb=dc325c1d762bbbdc1866e590f4649078f8600664;hp=925b77b6bc3c5bac8153a24d36946a9760bb253f;hpb=a084756d092167324ee09d3f819cc45407b58233;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-user-ns.c b/liblttng-ust/lttng-context-user-ns.c
index 925b77b6..3da97f0b 100644
--- a/liblttng-ust/lttng-context-user-ns.c
+++ b/liblttng-ust/lttng-context-user-ns.c
@@ -8,13 +8,14 @@
  */
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ringbuffer-context.h>
 
 #include "context-internal.h"
 #include "ns.h"
@@ -76,7 +77,7 @@ size_t user_ns_get_size(struct lttng_ust_ctx_field *field, 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;
 }
@@ -84,12 +85,12 @@ size_t user_ns_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 static
 void user_ns_record(struct lttng_ust_ctx_field *field,
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+		 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));
+	lttng_ust_lib_ring_buffer_align_ctx(ctx, lttng_ust_rb_alignof(user_ns));
 	chan->ops->event_write(ctx, &user_ns, sizeof(user_ns));
 }
 
@@ -107,8 +108,8 @@ 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_is_signed_type(ino_t),
+			lttng_ust_rb_alignof(ino_t) * CHAR_BIT,
+			lttng_ust_is_signed_type(ino_t),
 			BYTE_ORDER, 10);
 	if (!type)
 		return -ENOMEM;