X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flttng-context-ipc-ns.c;h=3bc3ffcb0c31d57933ce38a28d4554eef14eadec;hb=17f90b04459c851547b2dc6e90e3bded1b1206d5;hp=113ffb750648c86048be062c21aa4eae9b309796;hpb=437d5aa59380583ce1cd14d394a53b398be1275d;p=lttng-modules.git

diff --git a/src/lttng-context-ipc-ns.c b/src/lttng-context-ipc-ns.c
index 113ffb75..3bc3ffcb 100644
--- a/src/lttng-context-ipc-ns.c
+++ b/src/lttng-context-ipc-ns.c
@@ -14,6 +14,7 @@
 #include <linux/sched.h>
 #include <linux/ipc_namespace.h>
 #include <lttng/events.h>
+#include <lttng/events-internal.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
 #include <wrapper/namespace.h>
@@ -23,7 +24,7 @@
 	(LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
 
 static
-size_t ipc_ns_get_size(size_t offset)
+size_t ipc_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
 	size_t size = 0;
 
@@ -33,7 +34,7 @@ size_t ipc_ns_get_size(size_t offset)
 }
 
 static
-void ipc_ns_record(struct lttng_kernel_ctx_field *field,
+void ipc_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
 		 struct lib_ring_buffer_ctx *ctx,
 		 struct lttng_channel *chan)
 {
@@ -54,9 +55,9 @@ void ipc_ns_record(struct lttng_kernel_ctx_field *field,
 }
 
 static
-void ipc_ns_get_value(struct lttng_kernel_ctx_field *field,
-		struct lttng_probe_ctx *lttng_probe_ctx,
-		union lttng_ctx_value *value)
+void ipc_ns_get_value(void *priv,
+		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+		struct lttng_ctx_value *value)
 {
 	unsigned int ipc_ns_inum = 0;
 
@@ -70,7 +71,7 @@ void ipc_ns_get_value(struct lttng_kernel_ctx_field *field,
 	if (current->nsproxy)
 		ipc_ns_inum = current->nsproxy->ipc_ns->lttng_ns_inum;
 
-	value->s64 = ipc_ns_inum;
+	value->u.s64 = ipc_ns_inum;
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
@@ -78,7 +79,6 @@ static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_
 		lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10),
 		false, false, false),
 	ipc_ns_get_size,
-	NULL,
 	ipc_ns_record,
 	ipc_ns_get_value,
 	NULL, NULL);