LTTng metadata fix

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

diff --git a/ltt-events.c b/ltt-events.c
index 20db4c55bdc75703a8fad2b7016a38887ae768c1..5c4ebb16ee2c236c9a49d4bb7a3a15cf8c0601a9 100644 (file)
--- a/ltt-events.c
+++ b/ltt-events.c
@@ -23,6 +23,7 @@ static DEFINE_MUTEX(sessions_mutex);
 static struct kmem_cache *event_cache;
 
 static void _ltt_event_destroy(struct ltt_event *event);
+static void _ltt_channel_destroy(struct ltt_channel *chan);
 static int _ltt_event_unregister(struct ltt_event *event);
 static
 int _ltt_event_metadata_statedump(struct ltt_session *session,
@@ -191,6 +192,7 @@ active:
 /*
  * Only used internally at session destruction.
  */
+static
 void _ltt_channel_destroy(struct ltt_channel *chan)
 {
        chan->ops->channel_destroy(chan->chan);
@@ -308,19 +310,6 @@ int _ltt_event_unregister(struct ltt_event *event)
        return ret;
 }
 
-/*
- * Used when an event FD is released.
- */
-int ltt_event_unregister(struct ltt_event *event)
-{
-       int ret;
-
-       mutex_lock(&sessions_mutex);
-       ret = ltt_event_unregister(event);
-       mutex_unlock(&sessions_mutex);
-       return ret;
-}
-
 /*
  * Only used internally at session destruction.
  */
@@ -554,9 +543,6 @@ int _ltt_event_metadata_statedump(struct ltt_session *session,
        if (ret)
                goto end;
 
-
-
-
        event->metadata_dumped = 1;
 end:
        return ret;
@@ -694,9 +680,10 @@ int _ltt_session_metadata_statedump(struct ltt_session *session)
                "               uint32_t magic;\n"
                "               uint8_t  uuid[16];\n"
                "               uint32_t stream_id;\n"
-               "       };\n",
+               "       };\n"
                "};\n\n",
                ltt_alignof(uint8_t) * CHAR_BIT,
+               ltt_alignof(uint16_t) * CHAR_BIT,
                ltt_alignof(uint32_t) * CHAR_BIT,
                ltt_alignof(uint64_t) * CHAR_BIT,
                CTF_VERSION_MAJOR,