Commit f115d2b7 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt (Google)
Browse files

ring-buffer: Remove jump to out label in ring_buffer_swap_cpu() 

The function ring_buffer_swap_cpu() has a bunch of jumps to the label out
that simply returns "ret". There's no reason to jump to a label that
simply returns a value. Just return directly from there.

This goes back to almost the beginning when commit 8aabee57
("ring-buffer: remove unneeded get_online_cpus") was introduced. That
commit removed a put_online_cpus() from that label, but never updated all
the jumps to it that now no longer needed to do anything but return a
value.

Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Link: https://lore.kernel.org/20250527145753.6b45d840@gandalf.local.home


Reviewed-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 2d222165

kernel/trace/ring_buffer.c

+9 −14
Original line number Diff line number Diff line
@@ -6315,37 +6315,33 @@ int ring_buffer_swap_cpu(struct trace_buffer *buffer_a, 


	if (!cpumask_test_cpu(cpu, buffer_a->cpumask) ||

	    !cpumask_test_cpu(cpu, buffer_b->cpumask))

		goto out;

		return -EINVAL;



	cpu_buffer_a = buffer_a->buffers[cpu];

	cpu_buffer_b = buffer_b->buffers[cpu];



	/* It's up to the callers to not try to swap mapped buffers */

	if (WARN_ON_ONCE(cpu_buffer_a->mapped || cpu_buffer_b->mapped)) {

		ret = -EBUSY;

		goto out;

	}

	if (WARN_ON_ONCE(cpu_buffer_a->mapped || cpu_buffer_b->mapped))

		return -EBUSY;



	/* At least make sure the two buffers are somewhat the same */

	if (cpu_buffer_a->nr_pages != cpu_buffer_b->nr_pages)

		goto out;

		return -EINVAL;



	if (buffer_a->subbuf_order != buffer_b->subbuf_order)

		goto out;



	ret = -EAGAIN;

		return -EINVAL;



	if (atomic_read(&buffer_a->record_disabled))

		goto out;

		return -EAGAIN;



	if (atomic_read(&buffer_b->record_disabled))

		goto out;

		return -EAGAIN;



	if (atomic_read(&cpu_buffer_a->record_disabled))

		goto out;

		return -EAGAIN;



	if (atomic_read(&cpu_buffer_b->record_disabled))

		goto out;

		return -EAGAIN;



	/*

	 * We can't do a synchronize_rcu here because this
@@ -6382,7 +6378,6 @@ int ring_buffer_swap_cpu(struct trace_buffer *buffer_a, 
out_dec:

	atomic_dec(&cpu_buffer_a->record_disabled);

	atomic_dec(&cpu_buffer_b->record_disabled);

out:

	return ret;

}

EXPORT_SYMBOL_GPL(ring_buffer_swap_cpu);