ftrace: Remove a superfluous check (8d240dd8) · Commits · 戴 / test

register_ftrace_function() checks ftrace_disabled and calls __register_ftrace_function which does it again. Drop the first check and add the unlikely hint to the second one. Also, drop the label as John correctly notices. No functional change. Link: http://lkml.kernel.org/r/20120329171140.GE6409@aftab Cc: Borislav Petkov <bp@amd64.org> Cc: John Kacur <jkacur@redhat.com> Signed-off-by:

Borislav Petkov <borislav.petkov@amd.com> Signed-off-by:

Steven Rostedt <rostedt@goodmis.org>

kernel/trace/ftrace.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -312,7 +312,7 @@ static int remove_ftrace_list_ops(struct ftrace_ops **list,

		static int __register_ftrace_function(struct ftrace_ops *ops)
		{
		if (ftrace_disabled)
		if (unlikely(ftrace_disabled))
		return -ENODEV;

		if (FTRACE_WARN_ON(ops == &global_ops))
		@@ -4299,16 +4299,12 @@ int register_ftrace_function(struct ftrace_ops *ops)

		mutex_lock(&ftrace_lock);

		if (unlikely(ftrace_disabled))
		goto out_unlock;

		ret = __register_ftrace_function(ops);
		if (!ret)
		ret = ftrace_startup(ops, 0);


		out_unlock:
		mutex_unlock(&ftrace_lock);

		return ret;
		}
		EXPORT_SYMBOL_GPL(register_ftrace_function);

Admin message