Fix: don't perform extra flush on metadata channel

[lttng-modules.git] / lib / ringbuffer / frontend_internal.h

diff --git a/lib/ringbuffer/frontend_internal.h b/lib/ringbuffer/frontend_internal.h
index eda800de4e1fbaeb2aac47a720ba665269689021..2bc540370631ab53364a7f8fe318e776b386aabc 100644 (file)
--- a/lib/ringbuffer/frontend_internal.h
+++ b/lib/ringbuffer/frontend_internal.h
@@ -159,6 +159,9 @@ void lib_ring_buffer_switch_slow(struct lib_ring_buffer *buf,
 extern
 void lib_ring_buffer_switch_remote(struct lib_ring_buffer *buf);
 
+extern
+void lib_ring_buffer_switch_remote_empty(struct lib_ring_buffer *buf);
+
 /* Buffer write helpers */
 
 static inline
@@ -421,23 +424,20 @@ void lib_ring_buffer_write_commit_counter(const struct lib_ring_buffer_config *c
                                          struct channel *chan,
                                          unsigned long idx,
                                          unsigned long buf_offset,
-                                         unsigned long commit_count,
-                                         size_t slot_size)
+                                         unsigned long commit_count)
 {
-       unsigned long offset, commit_seq_old;
+       unsigned long commit_seq_old;
 
        if (config->oops != RING_BUFFER_OOPS_CONSISTENCY)
                return;
 
-       offset = buf_offset + slot_size;
-
        /*
         * subbuf_offset includes commit_count_mask. We can simply
         * compare the offsets within the subbuffer without caring about
         * buffer full/empty mismatch because offset is never zero here
         * (subbuffer header and record headers have non-zero length).
         */
-       if (unlikely(subbuf_offset(offset - commit_count, chan)))
+       if (unlikely(subbuf_offset(buf_offset - commit_count, chan)))
                return;
 
        commit_seq_old = v_read(config, &buf->commit_hot[idx].seq);