Commit 5e3949f0 authored Sep 29, 2015 by Dmitry Safonov Committed by Steven Rostedt Oct 13, 2015

ftrace: Remove redundant strsep in mod_callback

By now there isn't any subcommand for mod.

Before:
	sh$ echo '*:mod:ipv6:a' > set_ftrace_filter
	sh$ echo '*:mod:ipv6' > set_ftrace_filter
had the same results, but now first will result in:
	sh$ echo '*:mod:ipv6:a' > set_ftrace_filter
	-bash: echo: write error: Invalid argument

Also, I clarified ftrace_mod_callback code a little.

Link: http://lkml.kernel.org/r/1443545176-3215-1-git-send-email-0x7f454c46@gmail.com



Signed-off-by: Dmitry Safonov <0x7f454c46@gmail.com>
[ converted 'if (ret == 0)' to 'if (!ret)' ]
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

parent 6db02903

kernel/trace/ftrace.c

+5 −10

Original line number	Diff line number	Diff line
		@@ -3569,8 +3569,7 @@ static int
		ftrace_mod_callback(struct ftrace_hash *hash,
		char func, char cmd, char *param, int enable)
		{
		char *mod;
		int ret = -EINVAL;
		int ret;

		/*
		* cmd == 'mod' because we only registered this func
		@@ -3581,16 +3580,12 @@ ftrace_mod_callback(struct ftrace_hash *hash,
		*/

		/* we must have a module name */
		if (!param)
		return ret;

		mod = strsep(&param, ":");
		if (!strlen(mod))
		return ret;
		if (!param \|\| !strlen(param))
		return -EINVAL;

		ret = ftrace_match_module_records(hash, func, mod);
		ret = ftrace_match_module_records(hash, func, param);
		if (!ret)
		ret = -EINVAL;
		return -EINVAL;
		if (ret < 0)
		return ret;

Admin message