Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbab567c authored by Naveen N. Rao's avatar Naveen N. Rao Committed by Steven Rostedt (VMware)
Browse files

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: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarNaveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 30e7d894

kernel/trace/ftrace.c

+2 −2
Original line number Diff line number Diff line
@@ -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),