Update ABI

[lttng-modules.git] / lib / ringbuffer / ring_buffer_iterator.c

diff --git a/lib/ringbuffer/ring_buffer_iterator.c b/lib/ringbuffer/ring_buffer_iterator.c
index e8b042b025cd3ca0ff0e164de4699a1f31045991..1e60f2c43c104150ee6a6d85516763b77d0a647c 100644 (file)
--- a/lib/ringbuffer/ring_buffer_iterator.c
+++ b/lib/ringbuffer/ring_buffer_iterator.c
@@ -151,11 +151,11 @@ void lib_ring_buffer_get_empty_buf_records(const struct lib_ring_buffer_config *
                default:
                        /*
                         * Insert buffer into the heap, remove from empty buffer
-                        * list. The heap should never overflow.
+                        * list.
                         */
                        CHAN_WARN_ON(chan, len < 0);
                        list_del(&buf->iter.empty_node);
-                       CHAN_WARN_ON(chan, heap_insert(heap, buf) != NULL);
+                       CHAN_WARN_ON(chan, heap_insert(heap, buf));
                }
        }
 }
@@ -377,8 +377,7 @@ int channel_iterator_init(struct channel *chan)
 
                INIT_LIST_HEAD(&chan->iter.empty_head);
                ret = heap_init(&chan->iter.heap,
-                               num_possible_cpus()
-                               * sizeof(struct lib_ring_buffer *),
+                               num_possible_cpus(),
                                GFP_KERNEL, buf_is_higher);
                if (ret)
                        return ret;