Clean-up: lttng-sessiond: fix -Wshadow error in check_session_rotation_pending

[lttng-tools.git] / src / bin / lttng-sessiond / rotation-thread.c

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index f07672c220158d285325db3c57207edfed525f08..31e65113654c72258592f0d10bc64fc8f0364f90 100644 (file)
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -16,7 +16,6 @@
 #include <common/align.h>
 #include <common/time.h>
 #include <common/hashtable/utils.h>
-#include <sys/eventfd.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <signal.h>
@@ -352,13 +351,13 @@ void check_session_rotation_pending_on_consumers(struct ltt_session *session,
                        goto end;
                }
 
-                if (exists_status != CONSUMER_TRACE_CHUNK_EXISTS_STATUS_UNKNOWN_CHUNK) {
+               if (exists_status != CONSUMER_TRACE_CHUNK_EXISTS_STATUS_UNKNOWN_CHUNK) {
                        pthread_mutex_unlock(socket->lock);
                        chunk_exists_on_peer = true;
                        goto end;
-                }
+               }
                pthread_mutex_unlock(socket->lock);
-        }
+       }
 
 skip_ust:
        if (!session->kernel_session) {
@@ -381,11 +380,11 @@ skip_ust:
                        goto end;
                }
 
-                if (exists_status != CONSUMER_TRACE_CHUNK_EXISTS_STATUS_UNKNOWN_CHUNK) {
+               if (exists_status != CONSUMER_TRACE_CHUNK_EXISTS_STATUS_UNKNOWN_CHUNK) {
                        pthread_mutex_unlock(socket->lock);
                        chunk_exists_on_peer = true;
                        goto end;
-                }
+               }
                pthread_mutex_unlock(socket->lock);
        }
 skip_kernel:
@@ -495,8 +494,6 @@ int check_session_rotation_pending(struct ltt_session *session,
        ret = 0;
 check_ongoing_rotation:
        if (session->rotation_state == LTTNG_ROTATION_STATE_ONGOING) {
-               uint64_t chunk_being_archived_id;
-
                chunk_status = lttng_trace_chunk_get_id(
                                session->chunk_being_archived,
                                &chunk_being_archived_id);
@@ -548,7 +545,7 @@ int run_job(struct rotation_thread_job *job, struct ltt_session *session,
 
        switch (job->type) {
        case ROTATION_THREAD_JOB_TYPE_SCHEDULED_ROTATION:
-               ret = launch_session_rotation(session);
+               ret = launch_session_rotation(session);
                break;
        case ROTATION_THREAD_JOB_TYPE_CHECK_PENDING_ROTATION:
                ret = check_session_rotation_pending(session,
@@ -604,7 +601,7 @@ int handle_job_queue(struct rotation_thread_handle *handle,
                }
 
                session_lock(session);
-               ret = run_job(job, session, handle->notification_thread_handle);
+               ret = run_job(job, session, handle->notification_thread_handle);
                session_unlock(session);
                /* Release reference held by the job. */
                session_put(session);
@@ -717,7 +714,7 @@ int handle_notification_channel(int fd,
        status = lttng_notification_channel_has_pending_notification(
                        rotate_notification_channel, &notification_pending);
        if (status != LTTNG_NOTIFICATION_CHANNEL_STATUS_OK) {
-               ERR("[rotation-thread ]Error occurred while checking for pending notification");
+               ERR("[rotation-thread] Error occurred while checking for pending notification");
                ret = -1;
                goto end;
        }
@@ -772,7 +769,7 @@ void *thread_rotation(void *data)
        DBG("[rotation-thread] Started rotation thread");
        rcu_register_thread();
        rcu_thread_online();
-       health_register(health_sessiond, HEALTH_SESSIOND_TYPE_ROTATION);
+       health_register(the_health_sessiond, HEALTH_SESSIOND_TYPE_ROTATION);
        health_code_update();
 
        if (!handle) {
@@ -864,7 +861,7 @@ error:
        DBG("[rotation-thread] Exit");
        fini_thread_state(&thread);
 end:
-       health_unregister(health_sessiond);
+       health_unregister(the_health_sessiond);
        rcu_thread_offline();
        rcu_unregister_thread();
        return NULL;