Rename "tsc" to "timestamp"

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

diff --git a/src/lttng-context-uts-ns.c b/src/lttng-context-uts-ns.c
index 204cafb658962065805e77e6c60d8896284e4d6b..ca0c58fc11e01681aa3d9d4d656afc478362bddf 100644 (file)
--- a/src/lttng-context-uts-ns.c
+++ b/src/lttng-context-uts-ns.c
@@ -9,6 +9,8 @@
  *
  */
 
+#ifdef CONFIG_UTS_NS
+
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
@@ -17,14 +19,10 @@
 #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_UTS_NS) && \
-       (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
-
 static
-size_t uts_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset)
+size_t uts_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
        size_t size = 0;
 
@@ -34,9 +32,9 @@ size_t uts_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t off
 }
 
 static
-void uts_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
-                struct lttng_channel *chan)
+void uts_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
+                struct lttng_kernel_channel_buffer *chan)
 {
        unsigned int uts_ns_inum = 0;
 
@@ -48,15 +46,14 @@ void uts_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx,
         * namespaces, just dereference the pointers.
         */
        if (current->nsproxy)
-               uts_ns_inum = current->nsproxy->uts_ns->lttng_ns_inum;
+               uts_ns_inum = current->nsproxy->uts_ns->ns.inum;
 
-       lib_ring_buffer_align_ctx(ctx, lttng_alignof(uts_ns_inum));
-       chan->ops->event_write(ctx, &uts_ns_inum, sizeof(uts_ns_inum));
+       chan->ops->event_write(ctx, &uts_ns_inum, sizeof(uts_ns_inum), lttng_alignof(uts_ns_inum));
 }
 
 static
 void uts_ns_get_value(void *priv,
-               struct lttng_probe_ctx *lttng_probe_ctx,
+               struct lttng_kernel_probe_ctx *lttng_probe_ctx,
                struct lttng_ctx_value *value)
 {
        unsigned int uts_ns_inum = 0;
@@ -69,7 +66,7 @@ void uts_ns_get_value(void *priv,
         * namespaces, just dereference the pointers.
         */
        if (current->nsproxy)
-               uts_ns_inum = current->nsproxy->uts_ns->lttng_ns_inum;
+               uts_ns_inum = current->nsproxy->uts_ns->ns.inum;
 
        value->u.s64 = uts_ns_inum;
 }
@@ -77,7 +74,7 @@ void uts_ns_get_value(void *priv,
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
        lttng_kernel_static_event_field("uts_ns",
                lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10),
-               false, false, false),
+               false, false),
        uts_ns_get_size,
        uts_ns_record,
        uts_ns_get_value,