X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context-ipc-ns.c;h=13470f50b96d5fb70f679ec814d24701bd526bd5;hb=b53047135828b997a4eeb2cae7344cb169aa9c8c;hp=09d8f2e3c2fb70439b5d9e3e9a2ee586593a51e0;hpb=c50bdba26664558b966a324cd382bd2959f0444e;p=lttng-modules.git

diff --git a/lttng-context-ipc-ns.c b/lttng-context-ipc-ns.c
index 09d8f2e3..13470f50 100644
--- a/lttng-context-ipc-ns.c
+++ b/lttng-context-ipc-ns.c
@@ -13,13 +13,11 @@
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/ipc_namespace.h>
-#include <lttng-events.h>
-#include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/namespace.h>
-#include <lttng-tracer.h>
+#include <lttng/lttng-events.h>
+#include <ringbuffer/frontend_types.h>
+#include <lttng/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)
@@ -46,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));
@@ -67,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;
 }