Drop 'wrapper/namespace.h' wrapper

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

diff --git a/src/lttng-context-uts-ns.c b/src/lttng-context-uts-ns.c
index 04ddc80ff7b8e9d0ce2ab2eb9967e529a07956be..455b16038bdad31edef3457ddd3fb4168761449e 100644 (file)
--- a/src/lttng-context-uts-ns.c
+++ b/src/lttng-context-uts-ns.c
@@ -17,14 +17,13 @@
 #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_UTS_NS) && \
        (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
 
 static
-size_t uts_ns_get_size(size_t offset)
+size_t uts_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
        size_t size = 0;
 
@@ -34,9 +33,9 @@ size_t uts_ns_get_size(size_t offset)
 }
 
 static
-void uts_ns_record(struct lttng_kernel_ctx_field *field,
-                struct lib_ring_buffer_ctx *ctx,
-                struct lttng_channel *chan)
+void uts_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 uts_ns_inum = 0;
 
@@ -48,16 +47,15 @@ void uts_ns_record(struct lttng_kernel_ctx_field *field,
         * namespaces, just dereference the pointers.
         */
        if (current->nsproxy)
-               uts_ns_inum = current->nsproxy->uts_ns->lttng_ns_inum;
+               uts_ns_inum = current->nsproxy->uts_ns->ns.inum;
 
-       lib_ring_buffer_align_ctx(ctx, lttng_alignof(uts_ns_inum));
-       chan->ops->event_write(ctx, &uts_ns_inum, sizeof(uts_ns_inum));
+       chan->ops->event_write(ctx, &uts_ns_inum, sizeof(uts_ns_inum), lttng_alignof(uts_ns_inum));
 }
 
 static
-void uts_ns_get_value(struct lttng_kernel_ctx_field *field,
-               struct lttng_probe_ctx *lttng_probe_ctx,
-               union lttng_ctx_value *value)
+void uts_ns_get_value(void *priv,
+               struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+               struct lttng_ctx_value *value)
 {
        unsigned int uts_ns_inum = 0;
 
@@ -69,17 +67,16 @@ void uts_ns_get_value(struct lttng_kernel_ctx_field *field,
         * namespaces, just dereference the pointers.
         */
        if (current->nsproxy)
-               uts_ns_inum = current->nsproxy->uts_ns->lttng_ns_inum;
+               uts_ns_inum = current->nsproxy->uts_ns->ns.inum;
 
-       value->s64 = uts_ns_inum;
+       value->u.s64 = uts_ns_inum;
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
        lttng_kernel_static_event_field("uts_ns",
                lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10),
-               false, false, false),
+               false, false),
        uts_ns_get_size,
-       NULL,
        uts_ns_record,
        uts_ns_get_value,
        NULL, NULL);