X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context-mnt-ns.c;h=c6b7dbe017de976e7f09d3fe96b4a6d2ced910c4;hb=dd16bde78d5a6f2aee74cba38fe75f1d7922669c;hp=9443f40996086a77e1d81c608c3e633fa10aef1e;hpb=b7cdc18250880cc44edeef4a4b42c8ac7a135a6d;p=lttng-modules.git

diff --git a/lttng-context-mnt-ns.c b/lttng-context-mnt-ns.c
index 9443f409..c6b7dbe0 100644
--- a/lttng-context-mnt-ns.c
+++ b/lttng-context-mnt-ns.c
@@ -15,12 +15,9 @@
 #include <lttng-events.h>
 #include <linux/nsproxy.h>
 #include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/vmalloc.h>
-#include <wrapper/namespace.h>
 #include <lttng-tracer.h>
 
-#if !defined(LTTNG_MNT_NS_MISSING_HEADER) && \
-	(LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
+#if !defined(LTTNG_MNT_NS_MISSING_HEADER)
 
 #include <../fs/mount.h>
 
@@ -49,7 +46,7 @@ void mnt_ns_record(struct lttng_ctx_field *field,
 	 * namespaces, just dereference the pointers.
 	 */
 	if (current->nsproxy)
-		mnt_ns_inum = current->nsproxy->mnt_ns->lttng_ns_inum;
+		mnt_ns_inum = current->nsproxy->mnt_ns->ns.inum;
 
 	lib_ring_buffer_align_ctx(ctx, lttng_alignof(mnt_ns_inum));
 	chan->ops->event_write(ctx, &mnt_ns_inum, sizeof(mnt_ns_inum));
@@ -70,7 +67,7 @@ void mnt_ns_get_value(struct lttng_ctx_field *field,
 	 * namespaces, just dereference the pointers.
 	 */
 	if (current->nsproxy)
-		mnt_ns_inum = current->nsproxy->mnt_ns->lttng_ns_inum;
+		mnt_ns_inum = current->nsproxy->mnt_ns->ns.inum;
 
 	value->s64 = mnt_ns_inum;
 }
@@ -88,17 +85,16 @@ int lttng_add_mnt_ns_to_ctx(struct lttng_ctx **ctx)
 	}
 	field->event_field.name = "mnt_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 = mnt_ns_get_size;
 	field->record = mnt_ns_record;
 	field->get_value = mnt_ns_get_value;
 	lttng_context_update(*ctx);
-	wrapper_vmalloc_sync_all();
 	return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_mnt_ns_to_ctx);