Commit 5e3949f0 authored by Dmitry Safonov's avatar Dmitry Safonov Committed by Steven Rostedt

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.comSigned-off-by: default avatarDmitry Safonov <0x7f454c46@gmail.com>
[ converted 'if (ret == 0)' to 'if (!ret)' ]
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 6db02903
...@@ -3569,8 +3569,7 @@ static int ...@@ -3569,8 +3569,7 @@ static int
ftrace_mod_callback(struct ftrace_hash *hash, ftrace_mod_callback(struct ftrace_hash *hash,
char *func, char *cmd, char *param, int enable) char *func, char *cmd, char *param, int enable)
{ {
char *mod; int ret;
int ret = -EINVAL;
/* /*
* cmd == 'mod' because we only registered this func * cmd == 'mod' because we only registered this func
...@@ -3581,16 +3580,12 @@ ftrace_mod_callback(struct ftrace_hash *hash, ...@@ -3581,16 +3580,12 @@ ftrace_mod_callback(struct ftrace_hash *hash,
*/ */
/* we must have a module name */ /* we must have a module name */
if (!param) if (!param || !strlen(param))
return ret; return -EINVAL;
mod = strsep(&param, ":");
if (!strlen(mod))
return ret;
ret = ftrace_match_module_records(hash, func, mod); ret = ftrace_match_module_records(hash, func, param);
if (!ret) if (!ret)
ret = -EINVAL; return -EINVAL;
if (ret < 0) if (ret < 0)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment