X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context-user-ns.c;h=51cb6b52aef7fdf0f6dca8e1cc149f717ce983ee;hb=b53047135828b997a4eeb2cae7344cb169aa9c8c;hp=746e4d9d078259e67e23a704ec84a1d2d423d43e;hpb=a6cf40a4491954d6f81052f8bbce757f73727f16;p=lttng-modules.git

diff --git a/lttng-context-user-ns.c b/lttng-context-user-ns.c
index 746e4d9d..51cb6b52 100644
--- a/lttng-context-user-ns.c
+++ b/lttng-context-user-ns.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
  *
  * lttng-context-user-ns.c
  *
@@ -13,14 +13,11 @@
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/user_namespace.h>
-#include <lttng-events.h>
-#include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/vmalloc.h>
-#include <wrapper/namespace.h>
-#include <lttng-tracer.h>
+#include <lttng/lttng-events.h>
+#include <ringbuffer/frontend_types.h>
+#include <lttng/lttng-tracer.h>
 
-#if defined(CONFIG_USER_NS) && \
-	(LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
+#if defined(CONFIG_USER_NS)
 
 static
 size_t user_ns_get_size(size_t offset)
@@ -40,7 +37,7 @@ void user_ns_record(struct lttng_ctx_field *field,
 	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));
@@ -54,7 +51,7 @@ void user_ns_get_value(struct lttng_ctx_field *field,
 	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->s64 = user_ns_inum;
 }
@@ -72,17 +69,16 @@ int lttng_add_user_ns_to_ctx(struct lttng_ctx **ctx)
 	}
 	field->event_field.name = "user_ns";
 	field->event_field.type.atype = atype_integer;
-	field->event_field.type.u.basic.integer.size = sizeof(unsigned int) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.alignment = lttng_alignof(unsigned int) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(unsigned int);
-	field->event_field.type.u.basic.integer.reverse_byte_order = 0;
-	field->event_field.type.u.basic.integer.base = 10;
-	field->event_field.type.u.basic.integer.encoding = lttng_encode_none;
+	field->event_field.type.u.integer.size = sizeof(unsigned int) * CHAR_BIT;
+	field->event_field.type.u.integer.alignment = lttng_alignof(unsigned int) * CHAR_BIT;
+	field->event_field.type.u.integer.signedness = lttng_is_signed_type(unsigned int);
+	field->event_field.type.u.integer.reverse_byte_order = 0;
+	field->event_field.type.u.integer.base = 10;
+	field->event_field.type.u.integer.encoding = lttng_encode_none;
 	field->get_size = user_ns_get_size;
 	field->record = user_ns_record;
 	field->get_value = user_ns_get_value;
 	lttng_context_update(*ctx);
-	wrapper_vmalloc_sync_all();
 	return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_user_ns_to_ctx);