X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context-uts-ns.c;h=7141f6179af53c65ccd5ff808e93a4cd9fcb6d94;hb=b53047135828b997a4eeb2cae7344cb169aa9c8c;hp=67c42764fcc84cce391050639e120d495657a7dc;hpb=ceabb767180e064629b5a9ab4ed14449da864763;p=lttng-modules.git

diff --git a/lttng-context-uts-ns.c b/lttng-context-uts-ns.c
index 67c42764..7141f617 100644
--- a/lttng-context-uts-ns.c
+++ b/lttng-context-uts-ns.c
@@ -13,14 +13,11 @@
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/utsname.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_UTS_NS) && \
-	(LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
+#if defined(CONFIG_UTS_NS)
 
 static
 size_t uts_ns_get_size(size_t offset)
@@ -47,7 +44,7 @@ void uts_ns_record(struct lttng_ctx_field *field,
 	 * namespaces, just dereference the pointers.
 	 */
 	if (current->nsproxy)
-		uts_ns_inum = current->nsproxy->uts_ns->lttng_ns_inum;
+		uts_ns_inum = current->nsproxy->uts_ns->ns.inum;
 
 	lib_ring_buffer_align_ctx(ctx, lttng_alignof(uts_ns_inum));
 	chan->ops->event_write(ctx, &uts_ns_inum, sizeof(uts_ns_inum));
@@ -68,7 +65,7 @@ void uts_ns_get_value(struct lttng_ctx_field *field,
 	 * namespaces, just dereference the pointers.
 	 */
 	if (current->nsproxy)
-		uts_ns_inum = current->nsproxy->uts_ns->lttng_ns_inum;
+		uts_ns_inum = current->nsproxy->uts_ns->ns.inum;
 
 	value->s64 = uts_ns_inum;
 }
@@ -96,7 +93,6 @@ int lttng_add_uts_ns_to_ctx(struct lttng_ctx **ctx)
 	field->record = uts_ns_record;
 	field->get_value = uts_ns_get_value;
 	lttng_context_update(*ctx);
-	wrapper_vmalloc_sync_all();
 	return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_uts_ns_to_ctx);