Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1642704

[PATCH v2 1/4] ftrace: Simplify glob handling in unregister_ftrace_function_probe_func()

From "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>
Newsgroups linux.kernel
Subject [PATCH v2 1/4] ftrace: Simplify glob handling in unregister_ftrace_function_probe_func()
Date 2017-05-16 20:00 +0200
Message-ID <tHOVk-cY-19@gated-at.bofh.it> (permalink)
References <tHOVk-cY-5@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


Handle a NULL glob properly and simplify the check.

Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
---
 kernel/trace/ftrace.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 39dca4e86a94..c35c3e67d09a 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),
-- 
2.12.2

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH v2 0/4] ftrace: Fix a few issues "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> - 2017-05-16 20:00 +0200
  [PATCH v2 1/4] ftrace: Simplify glob handling in unregister_ftrace_function_probe_func() "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> - 2017-05-16 20:00 +0200
    Re: [PATCH v2 1/4] ftrace: Simplify glob handling in  unregister_ftrace_function_probe_func() Masami Hiramatsu <mhiramat@kernel.org> - 2017-05-17 05:10 +0200
  [PATCH v2 3/4] selftests/ftrace: Fix bashisms "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> - 2017-05-16 20:00 +0200

csiph-web