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

diff --git a/src/lttng-context-net-ns.c b/src/lttng-context-net-ns.c
index 54c28e0f..ad6d6d2a 100644
--- a/src/lttng-context-net-ns.c
+++ b/src/lttng-context-net-ns.c
@@ -9,6 +9,8 @@
  *
  */
 
+#ifdef CONFIG_NET_NS
+
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
@@ -18,12 +20,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_NET_NS) && \
-	(LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
-
 static
 size_t net_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
@@ -37,7 +35,7 @@ size_t net_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, siz
 static
 void net_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 net_ns_inum = 0;
 
@@ -49,10 +47,9 @@ void net_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
 	 * namespaces, just dereference the pointers.
 	 */
 	if (current->nsproxy)
-		net_ns_inum = current->nsproxy->net_ns->lttng_ns_inum;
+		net_ns_inum = current->nsproxy->net_ns->ns.inum;
 
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(net_ns_inum));
-	chan->ops->event_write(ctx, &net_ns_inum, sizeof(net_ns_inum));
+	chan->ops->event_write(ctx, &net_ns_inum, sizeof(net_ns_inum), lttng_alignof(net_ns_inum));
 }
 
 static
@@ -70,7 +67,7 @@ void net_ns_get_value(void *priv,
 	 * namespaces, just dereference the pointers.
 	 */
 	if (current->nsproxy)
-		net_ns_inum = current->nsproxy->net_ns->lttng_ns_inum;
+		net_ns_inum = current->nsproxy->net_ns->ns.inum;
 
 	value->u.s64 = net_ns_inum;
 }
@@ -78,7 +75,7 @@ void net_ns_get_value(void *priv,
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
 	lttng_kernel_static_event_field("net_ns",
 		lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10),
-		false, false, false),
+		false, false),
 	net_ns_get_size,
 	net_ns_record,
 	net_ns_get_value,