Rename "tsc" to "timestamp"

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

diff --git a/src/lttng-context-pid-ns.c b/src/lttng-context-pid-ns.c
index f99fec9afe5e8a3f8b49e2b8aa82cc9ac16599a8..7458ed322d23a5aa194e5d94dde723998b1f132b 100644 (file)
--- a/src/lttng-context-pid-ns.c
+++ b/src/lttng-context-pid-ns.c
@@ -9,6 +9,8 @@
  *
  */
 
+#ifdef CONFIG_PID_NS
+
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
@@ -17,12 +19,8 @@
 #include <lttng/events-internal.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
-#include <wrapper/namespace.h>
 #include <lttng/tracer.h>
 
-#if defined(CONFIG_PID_NS) && \
-       (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
-
 static
 size_t pid_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
@@ -49,10 +47,9 @@ void pid_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
        ns = task_active_pid_ns(current);
 
        if (ns)
-               pid_ns_inum = ns->lttng_ns_inum;
+               pid_ns_inum = ns->ns.inum;
 
-       lib_ring_buffer_align_ctx(ctx, lttng_alignof(pid_ns_inum));
-       chan->ops->event_write(ctx, &pid_ns_inum, sizeof(pid_ns_inum));
+       chan->ops->event_write(ctx, &pid_ns_inum, sizeof(pid_ns_inum), lttng_alignof(pid_ns_inum));
 }
 
 static
@@ -71,7 +68,7 @@ void pid_ns_get_value(void *priv,
        ns = task_active_pid_ns(current);
 
        if (ns)
-               pid_ns_inum = ns->lttng_ns_inum;
+               pid_ns_inum = ns->ns.inum;
 
        value->u.s64 = pid_ns_inum;
 }
@@ -79,7 +76,7 @@ void pid_ns_get_value(void *priv,
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
        lttng_kernel_static_event_field("pid_ns",
                lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10),
-               false, false, false),
+               false, false),
        pid_ns_get_size,
        pid_ns_record,
        pid_ns_get_value,