X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-context-mnt-ns.c;h=7853c94b448c8215489a4ebf50d3e86aa64a3dd5;hb=HEAD;hp=b58a151efd881fdcbaae28bfd23106b25681016c;hpb=8a57ec025ffbe56153748fd69b60118862707182;p=lttng-modules.git

diff --git a/src/lttng-context-mnt-ns.c b/src/lttng-context-mnt-ns.c
index b58a151e..c4bf5593 100644
--- a/src/lttng-context-mnt-ns.c
+++ b/src/lttng-context-mnt-ns.c
@@ -9,6 +9,8 @@
  *
  */
 
+#ifndef LTTNG_MNT_NS_MISSING_HEADER
+
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
@@ -17,12 +19,8 @@
 #include <linux/nsproxy.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
-#include <wrapper/namespace.h>
 #include <lttng/tracer.h>
 
-#if !defined(LTTNG_MNT_NS_MISSING_HEADER) && \
-	(LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
-
 #include <../fs/mount.h>
 
 static
@@ -38,7 +36,7 @@ size_t mnt_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, siz
 static
 void mnt_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
 		 struct lttng_kernel_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+		 struct lttng_kernel_channel_buffer *chan)
 {
 	unsigned int mnt_ns_inum = 0;
 
@@ -50,10 +48,9 @@ void mnt_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
 	 * 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));
+	chan->ops->event_write(ctx, &mnt_ns_inum, sizeof(mnt_ns_inum), lttng_alignof(mnt_ns_inum));
 }
 
 static
@@ -71,7 +68,7 @@ void mnt_ns_get_value(void *priv,
 	 * 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->u.s64 = mnt_ns_inum;
 }
@@ -79,7 +76,7 @@ void mnt_ns_get_value(void *priv,
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
 	lttng_kernel_static_event_field("mnt_ns",
 		lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10),
-		false, false, false),
+		false, false),
 	mnt_ns_get_size,
 	mnt_ns_record,
 	mnt_ns_get_value,