Skip to content

Commit 7c4df0c

Browse files
Qiujun Huanggregkh
authored andcommitted
ring-buffer: Return 0 on success from ring_buffer_resize()
commit 0a1754b upstream. We don't need to check the new buffer size, and the return value had confused resize_buffer_duplicate_size(). ... ret = ring_buffer_resize(trace_buf->buffer, per_cpu_ptr(size_buf->data,cpu_id)->entries, cpu_id); if (ret == 0) per_cpu_ptr(trace_buf->data, cpu_id)->entries = per_cpu_ptr(size_buf->data, cpu_id)->entries; ... Link: https://lkml.kernel.org/r/20201019142242.11560-1-hqjagain@gmail.com Cc: stable@vger.kernel.org Fixes: d60da50 ("tracing: Add a resize function to make one buffer equivalent to another buffer") Signed-off-by: Qiujun Huang <hqjagain@gmail.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 07a9b32 commit 7c4df0c

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

kernel/trace/ring_buffer.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1952,18 +1952,18 @@ int ring_buffer_resize(struct trace_buffer *buffer, unsigned long size,
19521952
{
19531953
struct ring_buffer_per_cpu *cpu_buffer;
19541954
unsigned long nr_pages;
1955-
int cpu, err = 0;
1955+
int cpu, err;
19561956

19571957
/*
19581958
* Always succeed at resizing a non-existent buffer:
19591959
*/
19601960
if (!buffer)
1961-
return size;
1961+
return 0;
19621962

19631963
/* Make sure the requested buffer exists */
19641964
if (cpu_id != RING_BUFFER_ALL_CPUS &&
19651965
!cpumask_test_cpu(cpu_id, buffer->cpumask))
1966-
return size;
1966+
return 0;
19671967

19681968
nr_pages = DIV_ROUND_UP(size, BUF_PAGE_SIZE);
19691969

@@ -2119,7 +2119,7 @@ int ring_buffer_resize(struct trace_buffer *buffer, unsigned long size,
21192119
}
21202120

21212121
mutex_unlock(&buffer->mutex);
2122-
return size;
2122+
return 0;
21232123

21242124
out_err:
21252125
for_each_buffer_cpu(buffer, cpu) {

0 commit comments

Comments
 (0)