X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context-cgroup-ns.c;h=b2f20c4f09cd479589d89c0167301078218348d9;hb=refs%2Ftags%2Ffor-upstreaming-review-1;hp=0c284966bcb97607e9997b835d6848484d1e2bf9;hpb=c50bdba26664558b966a324cd382bd2959f0444e;p=lttng-modules.git

diff --git a/lttng-context-cgroup-ns.c b/lttng-context-cgroup-ns.c
index 0c284966..b2f20c4f 100644
--- a/lttng-context-cgroup-ns.c
+++ b/lttng-context-cgroup-ns.c
@@ -13,14 +13,11 @@
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/cgroup.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_CGROUPS) && \
-	((LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) || \
-	 LTTNG_UBUNTU_KERNEL_RANGE(4,4,0,0, 4,5,0,0))
+#if defined(CONFIG_CGROUPS)
 
 static
 size_t cgroup_ns_get_size(size_t offset)
@@ -47,7 +44,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));
@@ -68,7 +65,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;
 }