X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context-pid-ns.c;h=894789b88f616b912433c6e121bab1cea4d52df4;hb=3d37a853416fbf9a232310321822b78a526ae5e7;hp=c749b678c19449469b2e77fd43fe19c51e495858;hpb=b7cdc18250880cc44edeef4a4b42c8ac7a135a6d;p=lttng-modules.git

diff --git a/lttng-context-pid-ns.c b/lttng-context-pid-ns.c
index c749b678..894789b8 100644
--- a/lttng-context-pid-ns.c
+++ b/lttng-context-pid-ns.c
@@ -15,12 +15,9 @@
 #include <linux/pid_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_PID_NS) && \
-	(LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
+#if defined(CONFIG_PID_NS)
 
 static
 size_t pid_ns_get_size(size_t offset)
@@ -48,7 +45,7 @@ void pid_ns_record(struct lttng_ctx_field *field,
 	ns = task_active_pid_ns(current);
 
 	if (ns)
-		pid_ns_inum = ns->lttng_ns_inum;
+		pid_ns_inum = ns->ns.inum;
 
 	lib_ring_buffer_align_ctx(ctx, lttng_alignof(pid_ns_inum));
 	chan->ops->event_write(ctx, &pid_ns_inum, sizeof(pid_ns_inum));
@@ -70,7 +67,7 @@ void pid_ns_get_value(struct lttng_ctx_field *field,
 	ns = task_active_pid_ns(current);
 
 	if (ns)
-		pid_ns_inum = ns->lttng_ns_inum;
+		pid_ns_inum = ns->ns.inum;
 
 	value->s64 = pid_ns_inum;
 }
@@ -88,17 +85,16 @@ int lttng_add_pid_ns_to_ctx(struct lttng_ctx **ctx)
 	}
 	field->event_field.name = "pid_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 = pid_ns_get_size;
 	field->record = pid_ns_record;
 	field->get_value = pid_ns_get_value;
 	lttng_context_update(*ctx);
-	wrapper_vmalloc_sync_all();
 	return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_pid_ns_to_ctx);