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

tracing: Remove unneeded goto out logic 

Several places in the trace.c file there's a goto out where the out is
simply a return. There's no reason to jump to the out label if it's not
doing any more logic but simply returning from the function.

Replace the goto outs with a return and remove the out labels.

Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: https://lore.kernel.org/20250801203857.538726745@kernel.org


Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 623526ba

kernel/trace/trace.c

+15 −23
Original line number Diff line number Diff line
@@ -1841,7 +1841,7 @@ int trace_get_user(struct trace_parser *parser, const char __user *ubuf, 


	ret = get_user(ch, ubuf++);

	if (ret)

		goto out;

		return ret;



	read++;

	cnt--;
@@ -1855,7 +1855,7 @@ int trace_get_user(struct trace_parser *parser, const char __user *ubuf, 
		while (cnt && isspace(ch)) {

			ret = get_user(ch, ubuf++);

			if (ret)

				goto out;

				return ret;

			read++;

			cnt--;

		}
@@ -1865,8 +1865,7 @@ int trace_get_user(struct trace_parser *parser, const char __user *ubuf, 
		/* only spaces were written */

		if (isspace(ch) || !ch) {

			*ppos += read;

			ret = read;

			goto out;

			return read;

		}

	}
@@ -1874,13 +1873,12 @@ int trace_get_user(struct trace_parser *parser, const char __user *ubuf, 
	while (cnt && !isspace(ch) && ch) {

		if (parser->idx < parser->size - 1)

			parser->buffer[parser->idx++] = ch;

		else {

			ret = -EINVAL;

			goto out;

		}

		else

			return -EINVAL;



		ret = get_user(ch, ubuf++);

		if (ret)

			goto out;

			return ret;

		read++;

		cnt--;

	}
@@ -1895,15 +1893,11 @@ int trace_get_user(struct trace_parser *parser, const char __user *ubuf, 
		/* Make sure the parsed string always terminates with '\0'. */

		parser->buffer[parser->idx] = 0;

	} else {

		ret = -EINVAL;

		goto out;

		return -EINVAL;

	}



	*ppos += read;

	ret = read;



out:

	return ret;

	return read;

}



/* TODO add a seq_buf_to_buffer() */
@@ -2405,10 +2399,10 @@ int __init register_tracer(struct tracer *type) 
	mutex_unlock(&trace_types_lock);



	if (ret || !default_bootup_tracer)

		goto out_unlock;

		return ret;



	if (strncmp(default_bootup_tracer, type->name, MAX_TRACER_SIZE))

		goto out_unlock;

		return 0;



	printk(KERN_INFO "Starting tracer '%s'\n", type->name);

	/* Do we want this tracer to start on bootup? */
@@ -2420,8 +2414,7 @@ int __init register_tracer(struct tracer *type) 
	/* disable other selftests, since this will break it. */

	disable_tracing_selftest("running a tracer");



 out_unlock:

	return ret;

	return 0;

}



static void tracing_reset_cpu(struct array_buffer *buf, int cpu)
@@ -8963,12 +8956,12 @@ ftrace_trace_snapshot_callback(struct trace_array *tr, struct ftrace_hash *hash, 
 out_reg:

	ret = tracing_arm_snapshot(tr);

	if (ret < 0)

		goto out;

		return ret;



	ret = register_ftrace_function_probe(glob, tr, ops, count);

	if (ret < 0)

		tracing_disarm_snapshot(tr);

 out:



	return ret < 0 ? ret : 0;

}
@@ -11070,7 +11063,7 @@ __init static int tracer_alloc_buffers(void) 
	BUILD_BUG_ON(TRACE_ITER_LAST_BIT > TRACE_FLAGS_MAX_SIZE);



	if (!alloc_cpumask_var(&tracing_buffer_mask, GFP_KERNEL))

		goto out;

		return -ENOMEM;



	if (!alloc_cpumask_var(&global_trace.tracing_cpumask, GFP_KERNEL))

		goto out_free_buffer_mask;
@@ -11188,7 +11181,6 @@ __init static int tracer_alloc_buffers(void) 
	free_cpumask_var(global_trace.tracing_cpumask);

out_free_buffer_mask:

	free_cpumask_var(tracing_buffer_mask);

out:

	return ret;

}