Cleanup: ust_session_id unused by buffer_reg_uid_consumer_channel_key

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

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index ccf315d8901efdcb2e04e50a4de9e85e1073bca2..19a325da1f1421b27c73bfb7866ae5204b87ca7b 100644 (file)
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -1169,7 +1169,7 @@ int kernel_rotate_session(struct ltt_session *session)
                 * reach 0 before we complete the iteration over all
                 * the channels.
                 */
-               ret = rotate_add_channel_pending(ksess->metadata->fd,
+               ret = rotate_add_channel_pending(ksess->metadata->key,
                                LTTNG_DOMAIN_KERNEL, session);
                if (ret < 0) {
                        ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
@@ -1190,7 +1190,7 @@ int kernel_rotate_session(struct ltt_session *session)
                                        ksess->uid, ksess->gid, ksess->consumer,
                                        ksess->consumer->subdir,
                                        /* is_metadata_channel */ false,
-                                       session->rotate_count,
+                                       session->current_archive_id,
                                        &session->rotate_pending_relay);
                        if (ret < 0) {
                                ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
@@ -1201,11 +1201,11 @@ int kernel_rotate_session(struct ltt_session *session)
                /*
                 * Rotate the metadata channel.
                 */
-               ret = consumer_rotate_channel(socket, ksess->metadata->fd,
+               ret = consumer_rotate_channel(socket, ksess->metadata->key,
                                ksess->uid, ksess->gid, ksess->consumer,
                                ksess->consumer->subdir,
                                /* is_metadata_channel */ true,
-                               session->rotate_count,
+                               session->current_archive_id,
                                &session->rotate_pending_relay);
                if (ret < 0) {
                        ret = LTTNG_ERR_KERN_CONSUMER_FAIL;