probe btrfs: remove compatibility code

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

diff --git a/lttng-context-user-ns.c b/lttng-context-user-ns.c
index 940e42104bdf6951ac25c281a0d17f7542859660..04a2c3ee26ad82e7cccb1abdcafdc2393fff516e 100644 (file)
--- a/lttng-context-user-ns.c
+++ b/lttng-context-user-ns.c
@@ -15,12 +15,9 @@
 #include <linux/user_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_USER_NS) && \
-       (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
+#if defined(CONFIG_USER_NS)
 
 static
 size_t user_ns_get_size(size_t offset)
@@ -40,7 +37,7 @@ void user_ns_record(struct lttng_ctx_field *field,
        unsigned int user_ns_inum = 0;
 
        if (current_user_ns())
-               user_ns_inum = current_user_ns()->lttng_ns_inum;
+               user_ns_inum = current_user_ns()->ns.inum;
 
        lib_ring_buffer_align_ctx(ctx, lttng_alignof(user_ns_inum));
        chan->ops->event_write(ctx, &user_ns_inum, sizeof(user_ns_inum));
@@ -54,7 +51,7 @@ void user_ns_get_value(struct lttng_ctx_field *field,
        unsigned int user_ns_inum = 0;
 
        if (current_user_ns())
-               user_ns_inum = current_user_ns()->lttng_ns_inum;
+               user_ns_inum = current_user_ns()->ns.inum;
 
        value->s64 = user_ns_inum;
 }
@@ -72,17 +69,16 @@ int lttng_add_user_ns_to_ctx(struct lttng_ctx **ctx)
        }
        field->event_field.name = "user_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 = user_ns_get_size;
        field->record = user_ns_record;
        field->get_value = user_ns_get_value;
        lttng_context_update(*ctx);
-       wrapper_vmalloc_sync_all();
        return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_user_ns_to_ctx);