lttng-events.c: remove cpu hotplug compatibility code

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

diff --git a/lttng-context-net-ns.c b/lttng-context-net-ns.c
index 6694037fbfbf81da6a58ddf48d6e2a7c1b55a5ce..b96afee8bc869074bb56c8af8d39d9f5079aec63 100644 (file)
--- a/lttng-context-net-ns.c
+++ b/lttng-context-net-ns.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
  *
  * lttng-context-net-ns.c
  *
@@ -16,12 +16,9 @@
 #include <net/net_namespace.h>
 #include <lttng-events.h>
 #include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/vmalloc.h>
-#include <wrapper/namespace.h>
 #include <lttng-tracer.h>
 
-#if defined(CONFIG_NET_NS) && \
-       (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
+#if defined(CONFIG_NET_NS)
 
 static
 size_t net_ns_get_size(size_t offset)
@@ -48,7 +45,7 @@ void net_ns_record(struct lttng_ctx_field *field,
         * 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));
@@ -69,7 +66,7 @@ void net_ns_get_value(struct lttng_ctx_field *field,
         * 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->s64 = net_ns_inum;
 }
@@ -87,17 +84,16 @@ int lttng_add_net_ns_to_ctx(struct lttng_ctx **ctx)
        }
        field->event_field.name = "net_ns";
        field->event_field.type.atype = atype_integer;
-       field->event_field.type.u.basic.integer.size = sizeof(unsigned int) * CHAR_BIT;
-       field->event_field.type.u.basic.integer.alignment = lttng_alignof(unsigned int) * CHAR_BIT;
-       field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(unsigned int);
-       field->event_field.type.u.basic.integer.reverse_byte_order = 0;
-       field->event_field.type.u.basic.integer.base = 10;
-       field->event_field.type.u.basic.integer.encoding = lttng_encode_none;
+       field->event_field.type.u.integer.size = sizeof(unsigned int) * CHAR_BIT;
+       field->event_field.type.u.integer.alignment = lttng_alignof(unsigned int) * CHAR_BIT;
+       field->event_field.type.u.integer.signedness = lttng_is_signed_type(unsigned int);
+       field->event_field.type.u.integer.reverse_byte_order = 0;
+       field->event_field.type.u.integer.base = 10;
+       field->event_field.type.u.integer.encoding = lttng_encode_none;
        field->get_size = net_ns_get_size;
        field->record = net_ns_record;
        field->get_value = net_ns_get_value;
        lttng_context_update(*ctx);
-       wrapper_vmalloc_sync_all();
        return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_net_ns_to_ctx);