|
@@ -1209,18 +1209,19 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned nr_pages)
|
|
|
|
|
|
for (i = 0; i < nr_pages; i++) {
|
|
|
if (RB_WARN_ON(cpu_buffer, list_empty(cpu_buffer->pages)))
|
|
|
- return;
|
|
|
+ goto out;
|
|
|
p = cpu_buffer->pages->next;
|
|
|
bpage = list_entry(p, struct buffer_page, list);
|
|
|
list_del_init(&bpage->list);
|
|
|
free_buffer_page(bpage);
|
|
|
}
|
|
|
if (RB_WARN_ON(cpu_buffer, list_empty(cpu_buffer->pages)))
|
|
|
- return;
|
|
|
+ goto out;
|
|
|
|
|
|
rb_reset_cpu(cpu_buffer);
|
|
|
rb_check_pages(cpu_buffer);
|
|
|
|
|
|
+out:
|
|
|
spin_unlock_irq(&cpu_buffer->reader_lock);
|
|
|
}
|
|
|
|
|
@@ -1237,7 +1238,7 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer,
|
|
|
|
|
|
for (i = 0; i < nr_pages; i++) {
|
|
|
if (RB_WARN_ON(cpu_buffer, list_empty(pages)))
|
|
|
- return;
|
|
|
+ goto out;
|
|
|
p = pages->next;
|
|
|
bpage = list_entry(p, struct buffer_page, list);
|
|
|
list_del_init(&bpage->list);
|
|
@@ -1246,6 +1247,7 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer,
|
|
|
rb_reset_cpu(cpu_buffer);
|
|
|
rb_check_pages(cpu_buffer);
|
|
|
|
|
|
+out:
|
|
|
spin_unlock_irq(&cpu_buffer->reader_lock);
|
|
|
}
|
|
|
|