X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context-mnt-ns.c;h=7a2e06052e396c5ab2a3dddc172672697880e9fe;hb=b53047135828b997a4eeb2cae7344cb169aa9c8c;hp=72e8efa1ffcf101464e3229afc5a04ea639b0c84;hpb=c50bdba26664558b966a324cd382bd2959f0444e;p=lttng-modules.git

diff --git a/lttng-context-mnt-ns.c b/lttng-context-mnt-ns.c
index 72e8efa1..7a2e0605 100644
--- a/lttng-context-mnt-ns.c
+++ b/lttng-context-mnt-ns.c
@@ -12,14 +12,12 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
-#include <lttng-events.h>
+#include <lttng/lttng-events.h>
 #include <linux/nsproxy.h>
-#include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/namespace.h>
-#include <lttng-tracer.h>
+#include <ringbuffer/frontend_types.h>
+#include <lttng/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>
 
@@ -48,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));
@@ -69,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;
 }