Rename "tsc" to "timestamp"

[lttng-modules.git] / src / lttng-context-mnt-ns.c

diff --git a/src/lttng-context-mnt-ns.c b/src/lttng-context-mnt-ns.c
index 7853c94b448c8215489a4ebf50d3e86aa64a3dd5..c4bf5593fe9bd34ee8d1aab68ac2b2aa11c39a55 100644 (file)
--- a/src/lttng-context-mnt-ns.c
+++ b/src/lttng-context-mnt-ns.c
@@ -9,6 +9,8 @@
  *
  */
 
+#ifndef LTTNG_MNT_NS_MISSING_HEADER
+
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
@@ -17,12 +19,8 @@
 #include <linux/nsproxy.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
-#include <wrapper/namespace.h>
 #include <lttng/tracer.h>
 
-#if !defined(LTTNG_MNT_NS_MISSING_HEADER) && \
-       (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
-
 #include <../fs/mount.h>
 
 static
@@ -50,7 +48,7 @@ void mnt_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
         * namespaces, just dereference the pointers.
         */
        if (current->nsproxy)
-               mnt_ns_inum = current->nsproxy->mnt_ns->lttng_ns_inum;
+               mnt_ns_inum = current->nsproxy->mnt_ns->ns.inum;
 
        chan->ops->event_write(ctx, &mnt_ns_inum, sizeof(mnt_ns_inum), lttng_alignof(mnt_ns_inum));
 }
@@ -70,7 +68,7 @@ void mnt_ns_get_value(void *priv,
         * namespaces, just dereference the pointers.
         */
        if (current->nsproxy)
-               mnt_ns_inum = current->nsproxy->mnt_ns->lttng_ns_inum;
+               mnt_ns_inum = current->nsproxy->mnt_ns->ns.inum;
 
        value->u.s64 = mnt_ns_inum;
 }
@@ -78,7 +76,7 @@ void mnt_ns_get_value(void *priv,
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
        lttng_kernel_static_event_field("mnt_ns",
                lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10),
-               false, false, false),
+               false, false),
        mnt_ns_get_size,
        mnt_ns_record,
        mnt_ns_get_value,