X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context-cgroup-ns.c;h=188c1d4434d6218ff7d42b27b5e6b00ffc294e46;hb=3cb4322863d147ebbddfda8e36dc3cd5968a5a49;hp=81486e514a592d96affa30f8e55880253c16cc48;hpb=a6cf40a4491954d6f81052f8bbce757f73727f16;p=lttng-modules.git

diff --git a/lttng-context-cgroup-ns.c b/lttng-context-cgroup-ns.c
index 81486e51..188c1d44 100644
--- a/lttng-context-cgroup-ns.c
+++ b/lttng-context-cgroup-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-cgroup-ns.c
  *
@@ -15,8 +15,6 @@
 #include <linux/cgroup.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_CGROUPS) && \
@@ -48,7 +46,7 @@ void cgroup_ns_record(struct lttng_ctx_field *field,
 	 * namespaces, just dereference the pointers.
 	 */
 	if (current->nsproxy)
-		cgroup_ns_inum = current->nsproxy->cgroup_ns->lttng_ns_inum;
+		cgroup_ns_inum = current->nsproxy->cgroup_ns->ns.inum;
 
 	lib_ring_buffer_align_ctx(ctx, lttng_alignof(cgroup_ns_inum));
 	chan->ops->event_write(ctx, &cgroup_ns_inum, sizeof(cgroup_ns_inum));
@@ -69,7 +67,7 @@ void cgroup_ns_get_value(struct lttng_ctx_field *field,
 	 * namespaces, just dereference the pointers.
 	 */
 	if (current->nsproxy)
-		cgroup_ns_inum = current->nsproxy->cgroup_ns->lttng_ns_inum;
+		cgroup_ns_inum = current->nsproxy->cgroup_ns->ns.inum;
 
 	value->s64 = cgroup_ns_inum;
 }
@@ -87,17 +85,16 @@ int lttng_add_cgroup_ns_to_ctx(struct lttng_ctx **ctx)
 	}
 	field->event_field.name = "cgroup_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 = cgroup_ns_get_size;
 	field->record = cgroup_ns_record;
 	field->get_value = cgroup_ns_get_value;
 	lttng_context_update(*ctx);
-	wrapper_vmalloc_sync_all();
 	return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_cgroup_ns_to_ctx);