Rename struct lib_ring_buffer_ctx to struct lttng_kernel_ring_buffer_ctx

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

diff --git a/src/lttng-context-net-ns.c b/src/lttng-context-net-ns.c
index 1c8adf4962502b840fabb4d9e0488c6159632df7..54c28e0fc17a601e9ee302178ac702bdbe919823 100644 (file)
--- a/src/lttng-context-net-ns.c
+++ b/src/lttng-context-net-ns.c
@@ -15,6 +15,7 @@
 #include <linux/nsproxy.h>
 #include <net/net_namespace.h>
 #include <lttng/events.h>
+#include <lttng/events-internal.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
 #include <wrapper/namespace.h>
@@ -24,7 +25,7 @@
        (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
 
 static
-size_t net_ns_get_size(size_t offset)
+size_t net_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
        size_t size = 0;
 
@@ -34,8 +35,8 @@ size_t net_ns_get_size(size_t offset)
 }
 
 static
-void net_ns_record(struct lttng_kernel_ctx_field *field,
-                struct lib_ring_buffer_ctx *ctx,
+void net_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        unsigned int net_ns_inum = 0;
@@ -55,9 +56,9 @@ void net_ns_record(struct lttng_kernel_ctx_field *field,
 }
 
 static
-void net_ns_get_value(struct lttng_kernel_ctx_field *field,
-               struct lttng_probe_ctx *lttng_probe_ctx,
-               union lttng_ctx_value *value)
+void net_ns_get_value(void *priv,
+               struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+               struct lttng_ctx_value *value)
 {
        unsigned int net_ns_inum = 0;
 
@@ -71,7 +72,7 @@ void net_ns_get_value(struct lttng_kernel_ctx_field *field,
        if (current->nsproxy)
                net_ns_inum = current->nsproxy->net_ns->lttng_ns_inum;
 
-       value->s64 = net_ns_inum;
+       value->u.s64 = net_ns_inum;
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
@@ -79,7 +80,6 @@ static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_
                lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10),
                false, false, false),
        net_ns_get_size,
-       NULL,
        net_ns_record,
        net_ns_get_value,
        NULL, NULL);