Drop 'wrapper/namespace.h' wrapper

[lttng-modules.git] / src / lttng-context-ipc-ns.c

diff --git a/src/lttng-context-ipc-ns.c b/src/lttng-context-ipc-ns.c
index 5a805f1e25e0223338d07addc9ad1076daf8539c..e6d662bbc146c2dec7ba45024022f487c1800b2e 100644 (file)
--- a/src/lttng-context-ipc-ns.c
+++ b/src/lttng-context-ipc-ns.c
@@ -17,7 +17,6 @@
 #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) && \
@@ -36,7 +35,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 +47,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 +67,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 +75,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,