Merge "trace: Fix race in trace_open and buffer resize call"
This commit is contained in:
commit
0e13e74f0c
@ -4405,6 +4405,8 @@ void ring_buffer_reset_cpu(struct ring_buffer *buffer, int cpu)
|
||||
|
||||
if (!cpumask_test_cpu(cpu, buffer->cpumask))
|
||||
return;
|
||||
/* prevent another thread from changing buffer sizes */
|
||||
mutex_lock(&buffer->mutex);
|
||||
|
||||
atomic_inc(&buffer->resize_disabled);
|
||||
atomic_inc(&cpu_buffer->record_disabled);
|
||||
@ -4428,6 +4430,8 @@ void ring_buffer_reset_cpu(struct ring_buffer *buffer, int cpu)
|
||||
|
||||
atomic_dec(&cpu_buffer->record_disabled);
|
||||
atomic_dec(&buffer->resize_disabled);
|
||||
|
||||
mutex_unlock(&buffer->mutex);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(ring_buffer_reset_cpu);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user