X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-context-mnt-ns.c;h=cc41dc7d489380ca89c69c2bfa8e2047598bb5a7;hb=93e5bcec1d8d550a1983bbc013248dbd83573cc7;hp=232c5defff7442b285f618d978f21457ba23f0ef;hpb=437d5aa59380583ce1cd14d394a53b398be1275d;p=lttng-modules.git

diff --git a/src/lttng-context-mnt-ns.c b/src/lttng-context-mnt-ns.c
index 232c5def..cc41dc7d 100644
--- a/src/lttng-context-mnt-ns.c
+++ b/src/lttng-context-mnt-ns.c
@@ -17,7 +17,6 @@
 #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) && \
@@ -26,7 +25,7 @@
 #include <../fs/mount.h>
 
 static
-size_t mnt_ns_get_size(size_t offset)
+size_t mnt_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
 	size_t size = 0;
 
@@ -36,9 +35,9 @@ size_t mnt_ns_get_size(size_t offset)
 }
 
 static
-void mnt_ns_record(struct lttng_kernel_ctx_field *field,
-		 struct lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+void mnt_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
+		 struct lttng_kernel_ring_buffer_ctx *ctx,
+		 struct lttng_kernel_channel_buffer *chan)
 {
 	unsigned int mnt_ns_inum = 0;
 
@@ -50,16 +49,15 @@ void mnt_ns_record(struct lttng_kernel_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));
+	chan->ops->event_write(ctx, &mnt_ns_inum, sizeof(mnt_ns_inum), lttng_alignof(mnt_ns_inum));
 }
 
 static
-void mnt_ns_get_value(struct lttng_kernel_ctx_field *field,
-		struct lttng_probe_ctx *lttng_probe_ctx,
-		union lttng_ctx_value *value)
+void mnt_ns_get_value(void *priv,
+		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+		struct lttng_ctx_value *value)
 {
 	unsigned int mnt_ns_inum = 0;
 
@@ -71,17 +69,16 @@ void mnt_ns_get_value(struct lttng_kernel_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;
+	value->u.s64 = mnt_ns_inum;
 }
 
 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,
-	NULL,
 	mnt_ns_record,
 	mnt_ns_get_value,
 	NULL, NULL);