fix: uuid: Decouple guid_t and uuid_le types and respective macros (v6.3)

See upstream commit :

  commit 5e6a51787fef20b849682d8c49ec9c2beed5c373
  Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  Date:   Tue Jan 24 15:38:38 2023 +0200

    uuid: Decouple guid_t and uuid_le types and respective macros

    The guid_t type and respective macros are being used internally only.
    The uuid_le has its user outside the kernel. Decouple these types and
    macros, and make guid_t completely internal type to the kernel.

Change-Id: I8644fd139b0630e9cf18886b84e33bffab1e5abd
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/lttng/events-internal.h b/include/lttng/events-internal.h
index ef1bed28432008fed28c1d2dbc8541f482644a38..a727230ffffb8c21320b04b502e98ff4755987d1 100644 (file)
--- a/include/lttng/events-internal.h
+++ b/include/lttng/events-internal.h
@@ -9,6 +9,7 @@
 #define _LTTNG_EVENTS_INTERNAL_H
 
 #include <wrapper/compiler_attributes.h>
+#include <wrapper/uuid.h>
 
 #include <lttng/events.h>
 
@@ -309,7 +310,7 @@ struct lttng_metadata_cache {
        atomic_t producing;             /* Metadata being produced (incomplete) */
        struct kref refcount;           /* Metadata cache usage */
        struct list_head metadata_stream;       /* Metadata stream list */
-       uuid_le uuid;                   /* Trace session unique ID (copy) */
+       guid_t uuid;                    /* Trace session unique ID (copy) */
        struct mutex lock;              /* Produce/consume lock */
        uint64_t version;               /* Current version of the metadata */
 };
@@ -459,7 +460,7 @@ struct lttng_kernel_session_private {
        struct list_head events;                /* Event list head */
        struct list_head list;                  /* Session list */
        unsigned int free_chan_id;              /* Next chan ID to allocate */
-       uuid_le uuid;                           /* Trace session unique ID */
+       guid_t uuid;                            /* Trace session unique ID */
        struct lttng_metadata_cache *metadata_cache;
        unsigned int metadata_dumped:1,
                tstate:1;                       /* Transient enable state */