ring-buffer: Simplify reset_disabled_cpu_buffer() with use of guard()

Use guard(raw_spinlock_irqsave)() in reset_disabled_cpu_buffer() to
simplify the locking.

Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Link: https://lore.kernel.org/20250527144623.77a9cc47@gandalf.local.home
Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index c912ce4c8c89aca41ab31c05dd4ed2cd9f5a284b..58cca10f482bf31eb7f3f864f7c87ebfe75359c2 100644 (file)
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -6113,21 +6113,16 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
 /* Must have disabled the cpu buffer then done a synchronize_rcu */
 static void reset_disabled_cpu_buffer(struct ring_buffer_per_cpu *cpu_buffer)
 {
-       unsigned long flags;
-
-       raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
+       guard(raw_spinlock_irqsave)(&cpu_buffer->reader_lock);
 
        if (RB_WARN_ON(cpu_buffer, local_read(&cpu_buffer->committing)))
-               goto out;
+               return;
 
        arch_spin_lock(&cpu_buffer->lock);
 
        rb_reset_cpu(cpu_buffer);
 
        arch_spin_unlock(&cpu_buffer->lock);
-
- out:
-       raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
 }
 
 /**