put_ulong calls in lib_ring_buffer_compat_ioctl() should be compat

[lttng-modules.git] / lttng-events.c

diff --git a/lttng-events.c b/lttng-events.c
index 7a1be7295a7ef33d1e61f692d9a2926c0ed03d77..4f30904dc0c922d7c865369387a42c4d860a45c9 100644 (file)
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -30,8 +30,10 @@
 #include "wrapper/uuid.h"
 #include "wrapper/vmalloc.h"   /* for wrapper_vmalloc_sync_all() */
 #include "wrapper/random.h"
+#include "wrapper/tracepoint.h"
 #include "lttng-events.h"
 #include "lttng-tracer.h"
+#include "lttng-abi-old.h"
 
 static LIST_HEAD(sessions);
 static LIST_HEAD(lttng_transport_list);
@@ -316,7 +318,7 @@ struct lttng_event *lttng_event_create(struct lttng_channel *chan,
                event->desc = lttng_event_get(event_param->name);
                if (!event->desc)
                        goto register_error;
-               ret = tracepoint_probe_register(event_param->name,
+               ret = kabi_2635_tracepoint_probe_register(event_param->name,
                                event->desc->probe_callback,
                                event);
                if (ret)
@@ -420,7 +422,7 @@ int _lttng_event_unregister(struct lttng_event *event)
 
        switch (event->instrumentation) {
        case LTTNG_KERNEL_TRACEPOINT:
-               ret = tracepoint_probe_unregister(event->desc->name,
+               ret = kabi_2635_tracepoint_probe_unregister(event->desc->name,
                                                  event->desc->probe_callback,
                                                  event);
                if (ret)
@@ -815,9 +817,9 @@ int _lttng_stream_packet_context_declare(struct lttng_session *session)
                "struct packet_context {\n"
                "       uint64_clock_monotonic_t timestamp_begin;\n"
                "       uint64_clock_monotonic_t timestamp_end;\n"
+               "       uint64_t content_size;\n"
+               "       uint64_t packet_size;\n"
                "       unsigned long events_discarded;\n"
-               "       uint32_t content_size;\n"
-               "       uint32_t packet_size;\n"
                "       uint32_t cpu_id;\n"
                "};\n\n"
                );
@@ -903,7 +905,6 @@ int _lttng_session_metadata_statedump(struct lttng_session *session)
        unsigned char uuid_s[37], clock_uuid_s[BOOT_ID_LEN];
        struct lttng_channel *chan;
        struct lttng_event *event;
-       char hostname[__NEW_UTS_LEN + 1];
        int ret = 0;
 
        if (!ACCESS_ONCE(session->active))
@@ -960,11 +961,6 @@ int _lttng_session_metadata_statedump(struct lttng_session *session)
        if (ret)
                goto end;
 
-       rcu_read_lock();
-       memcpy(hostname, task_nsproxy(current)->uts_ns->name.nodename,
-               sizeof(hostname));
-       rcu_read_unlock();
-
        ret = lttng_metadata_printf(session,
                "env {\n"
                "       hostname = \"%s\";\n"
@@ -977,7 +973,7 @@ int _lttng_session_metadata_statedump(struct lttng_session *session)
                "       tracer_minor = %d;\n"
                "       tracer_patchlevel = %d;\n"
                "};\n\n",
-               hostname,
+               current->nsproxy->uts_ns->name.nodename,
                utsname()->sysname,
                utsname()->release,
                utsname()->version,