From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752946AbdEQDDI (ORCPT ); Tue, 16 May 2017 23:03:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:39650 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750949AbdEQDDG (ORCPT ); Tue, 16 May 2017 23:03:06 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E2BD239D7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=mhiramat@kernel.org Date: Wed, 17 May 2017 12:02:57 +0900 From: Masami Hiramatsu To: "Naveen N. Rao" Cc: Steven Rostedt , Shuah Khan , Masami Hiramatsu , Michael Ellerman , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: Re: [PATCH v2 1/4] ftrace: Simplify glob handling in unregister_ftrace_function_probe_func() Message-Id: <20170517120257.91dcdfe15e72b0e31b385b4c@kernel.org> In-Reply-To: <5df74d4ffb4721db6d5a22fa08ca031d62ead493.1494956770.git.naveen.n.rao@linux.vnet.ibm.com> References: <5df74d4ffb4721db6d5a22fa08ca031d62ead493.1494956770.git.naveen.n.rao@linux.vnet.ibm.com> X-Mailer: Sylpheed 3.5.0 (GTK+ 2.24.31; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 16 May 2017 23:21:25 +0530 "Naveen N. Rao" wrote: > Handle a NULL glob properly and simplify the check. > Looks good to me. Reviewed-by: Masami Hiramatsu Thanks! > Signed-off-by: Naveen N. Rao > --- > 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 > -- Masami Hiramatsu