X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flttng-context-ipc-ns.c;h=28108a0f543d6fab46e806c7d57ef20003e49760;hb=6e1649431d63071a951fb9a73ae0f94d69f503df;hp=5a805f1e25e0223338d07addc9ad1076daf8539c;hpb=8a57ec025ffbe56153748fd69b60118862707182;p=lttng-modules.git

diff --git a/src/lttng-context-ipc-ns.c b/src/lttng-context-ipc-ns.c
index 5a805f1e..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,12 +19,8 @@
 #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_kernel_probe_ctx *probe_ctx, size_t offset)
 {
@@ -36,7 +34,7 @@ size_t ipc_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, siz
 static
 void ipc_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 ipc_ns_inum = 0;
 
@@ -48,10 +46,9 @@ void ipc_ns_record(void *priv, struct lttng_kernel_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
@@ -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,