Rename rotate_count to current_archive_id

[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 e6b9b6a1e72790702a7d96e1412dd3bcadc43662..dcae248b4088c5aa068b871afbc37871176f532b 100644 (file)
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -433,7 +433,7 @@ int rotate_pending_relay_timer(struct ltt_session *session)
 
        DBG("[rotation-thread] Check rotate pending on session %" PRIu64,
                        session->id);
-       ret = relay_rotate_pending(session, session->rotate_count - 1);
+       ret = relay_rotate_pending(session, session->current_archive_id - 1);
        if (ret < 0) {
                ERR("[rotation-thread] Check relay rotate pending");
                goto end;
@@ -732,11 +732,6 @@ int handle_notification_channel(int fd, uint32_t revents,
 
 end:
        lttng_notification_destroy(notification);
-       if (ret != 0) {
-               goto end;
-       }
-
-
        return ret;
 }