X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context-user-ns.c;h=1dc3f7ebe7d516d4bf2e9a9e6d9fb078a4172d58;hb=39848b23f3afb4e6a51550a9d12e5610fbfdb8b5;hp=ff56f551ae5e1ac4aaccabeccbdc45f8863e0b47;hpb=ceabb767180e064629b5a9ab4ed14449da864763;p=lttng-modules.git

diff --git a/lttng-context-user-ns.c b/lttng-context-user-ns.c
index ff56f551..1dc3f7eb 100644
--- a/lttng-context-user-ns.c
+++ b/lttng-context-user-ns.c
@@ -14,13 +14,10 @@
 #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 <include/ringbuffer/frontend_types.h>
 #include <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;
 }
@@ -82,7 +79,6 @@ int lttng_add_user_ns_to_ctx(struct lttng_ctx **ctx)
 	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);