Fix: Warnings introduced by backported fixes

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index bac01a0359ab85d93990c0fcb6ec1676c7cd896b..830d231002b7de098d5a0e55f6b02822e5153cde 100644 (file)
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -838,7 +838,6 @@ int kernel_snapshot_record(struct ltt_kernel_session *ksess,
        struct consumer_socket *socket;
        struct lttng_ht_iter iter;
        struct ltt_kernel_metadata *saved_metadata;
-       uint64_t max_size_per_stream = 0;
 
        assert(ksess);
        assert(ksess->consumer);

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index c9a5f52618089fdbf48d5ab7364141ecf99a699b..eab8f90d1a10bed3b9202d35bc459ffeb0386965 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -591,7 +591,6 @@ static int push_metadata(struct ust_registry_session *registry,
        return 0;
 
 error:
-end:
        return ret_val;
 }
 
@@ -4092,7 +4091,6 @@ int ust_app_flush_session(struct ltt_ust_session *usess)
                break;
        }
 
-end_no_session:
        rcu_read_unlock();
        health_code_update();
        return ret;
@@ -4988,7 +4986,6 @@ int ust_app_snapshot_record(struct ltt_ust_session *usess,
        struct lttng_ht_iter iter;
        struct ust_app *app;
        char pathname[PATH_MAX];
-       uint64_t max_stream_size = 0;
 
        assert(usess);
        assert(output);

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 25db6604a698fb2821af398dc05cf92ad2d59cec..a5bdd1e7a842debf5fbcf1d88b16b817a7f0f780 100644 (file)
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -2330,7 +2330,6 @@ restart:
 
        /* All is OK */
        err = 0;
-error:
 end:
        DBG("Metadata poll thread exiting");