From: Naveen N. Rao Date: Tue, 16 May 2017 17:51:25 +0000 (+0530) Subject: ftrace: Simplify glob handling in unregister_ftrace_function_probe_func() X-Git-Tag: v4.14-rc1~866^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cbab567c3dc7d6f443b4c84eab76e8967d5c1dee;p=platform%2Fkernel%2Flinux-rpi.git ftrace: Simplify glob handling in unregister_ftrace_function_probe_func() Handle a NULL glob properly and simplify the check. Link: http://lkml.kernel.org/r/5df74d4ffb4721db6d5a22fa08ca031d62ead493.1494956770.git.naveen.n.rao@linux.vnet.ibm.com Reviewed-by: Masami Hiramatsu Signed-off-by: Naveen N. Rao Signed-off-by: Steven Rostedt (VMware) --- diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 39dca4e..c35c3e6 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -4144,9 +4144,9 @@ unregister_ftrace_function_probe_func(char *glob, struct trace_array *tr, int i, ret = -ENODEV; int size; - if (glob && (strcmp(glob, "*") == 0 || !strlen(glob))) + if (!glob || !strlen(glob) || !strcmp(glob, "*")) func_g.search = NULL; - else if (glob) { + else { int not; func_g.type = filter_parse_regex(glob, strlen(glob),