Move wrapper/ringbuffer to include/ringbuffer

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

diff --git a/lttng-context-ipc-ns.c b/lttng-context-ipc-ns.c
index cccd976602b7ec97118d50d959eae28731aa878d..e5e7d6ee601354857d33e887bd1e9003ab45ff9c 100644 (file)
--- a/lttng-context-ipc-ns.c
+++ b/lttng-context-ipc-ns.c
@@ -14,13 +14,10 @@
 #include <linux/sched.h>
 #include <linux/ipc_namespace.h>
 #include <lttng-events.h>
-#include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/vmalloc.h>
-#include <wrapper/namespace.h>
+#include <include/ringbuffer/frontend_types.h>
 #include <lttng-tracer.h>
 
-#if defined(CONFIG_IPC_NS) && \
-       (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
+#if defined(CONFIG_IPC_NS)
 
 static
 size_t ipc_ns_get_size(size_t offset)
@@ -47,7 +44,7 @@ void ipc_ns_record(struct lttng_ctx_field *field,
         * namespaces, just dereference the pointers.
         */
        if (current->nsproxy)
-               ipc_ns_inum = current->nsproxy->ipc_ns->lttng_ns_inum;
+               ipc_ns_inum = current->nsproxy->ipc_ns->ns.inum;
 
        lib_ring_buffer_align_ctx(ctx, lttng_alignof(ipc_ns_inum));
        chan->ops->event_write(ctx, &ipc_ns_inum, sizeof(ipc_ns_inum));
@@ -68,7 +65,7 @@ void ipc_ns_get_value(struct lttng_ctx_field *field,
         * namespaces, just dereference the pointers.
         */
        if (current->nsproxy)
-               ipc_ns_inum = current->nsproxy->ipc_ns->lttng_ns_inum;
+               ipc_ns_inum = current->nsproxy->ipc_ns->ns.inum;
 
        value->s64 = ipc_ns_inum;
 }
@@ -96,7 +93,6 @@ int lttng_add_ipc_ns_to_ctx(struct lttng_ctx **ctx)
        field->record = ipc_ns_record;
        field->get_value = ipc_ns_get_value;
        lttng_context_update(*ctx);
-       wrapper_vmalloc_sync_all();
        return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_ipc_ns_to_ctx);