X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-context-ipc-ns.c;h=28108a0f543d6fab46e806c7d57ef20003e49760;hb=18fd64422b4297f9beea82f1c1a97b80791312e4;hp=d66415397272f24455ae25e080b0d203c85f2985;hpb=0fe45627bdbdb4e81c042bc9b784e4b47abfa4b6;p=lttng-modules.git

diff --git a/src/lttng-context-ipc-ns.c b/src/lttng-context-ipc-ns.c
index d6641539..28108a0f 100644
--- a/src/lttng-context-ipc-ns.c
+++ b/src/lttng-context-ipc-ns.c
@@ -9,6 +9,8 @@
  *
  */
 
+#ifdef CONFIG_IPC_NS
+
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
@@ -17,14 +19,10 @@
 #include <lttng/events-internal.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
-#include <wrapper/namespace.h>
 #include <lttng/tracer.h>
 
-#if defined(CONFIG_IPC_NS) && \
-	(LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
-
 static
-size_t ipc_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, 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;
 
@@ -34,9 +32,9 @@ size_t ipc_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t off
 }
 
 static
-void ipc_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx,
-		 struct lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+void ipc_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 ipc_ns_inum = 0;
 
@@ -48,15 +46,14 @@ void ipc_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx,
 	 * namespaces, just dereference the pointers.
 	 */
 	if (current->nsproxy)
-		ipc_ns_inum = current->nsproxy->ipc_ns->lttng_ns_inum;
+		ipc_ns_inum = current->nsproxy->ipc_ns->ns.inum;
 
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(ipc_ns_inum));
-	chan->ops->event_write(ctx, &ipc_ns_inum, sizeof(ipc_ns_inum));
+	chan->ops->event_write(ctx, &ipc_ns_inum, sizeof(ipc_ns_inum), lttng_alignof(ipc_ns_inum));
 }
 
 static
 void ipc_ns_get_value(void *priv,
-		struct lttng_probe_ctx *lttng_probe_ctx,
+		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
 		struct lttng_ctx_value *value)
 {
 	unsigned int ipc_ns_inum = 0;
@@ -69,7 +66,7 @@ void ipc_ns_get_value(void *priv,
 	 * namespaces, just dereference the pointers.
 	 */
 	if (current->nsproxy)
-		ipc_ns_inum = current->nsproxy->ipc_ns->lttng_ns_inum;
+		ipc_ns_inum = current->nsproxy->ipc_ns->ns.inum;
 
 	value->u.s64 = ipc_ns_inum;
 }
@@ -77,7 +74,7 @@ void ipc_ns_get_value(void *priv,
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
 	lttng_kernel_static_event_field("ipc_ns",
 		lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10),
-		false, false, false),
+		false, false),
 	ipc_ns_get_size,
 	ipc_ns_record,
 	ipc_ns_get_value,