From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758713AbdEORWU (ORCPT ); Mon, 15 May 2017 13:22:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:45834 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757145AbdEORWS (ORCPT ); Mon, 15 May 2017 13:22:18 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 87AA123900 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=goodmis.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=rostedt@goodmis.org Date: Mon, 15 May 2017 13:22:10 -0400 From: Steven Rostedt To: "Naveen N. Rao" Cc: Shuah Khan , Michael Ellerman , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: Re: [PATCH 1/4] ftrace: Simplify glob handling in unregister_ftrace_function_probe_func() Message-ID: <20170515132210.5efab11c@gandalf.local.home> In-Reply-To: <95a1ae9c5dc472fa8b23c0f2ce0ad8276f35d30e.1494702964.git.naveen.n.rao@linux.vnet.ibm.com> References: <95a1ae9c5dc472fa8b23c0f2ce0ad8276f35d30e.1494702964.git.naveen.n.rao@linux.vnet.ibm.com> X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-pc-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 Sun, 14 May 2017 01:01:01 +0530 "Naveen N. Rao" wrote: > Handle a NULL glob properly. > > 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..28dc824ad072 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 || (glob && (strcmp(glob, "*") == 0 || !strlen(glob)))) Actually, this can also be simplified. if (!glob || strcmp(glob, "*") == 0) || !strlen(glob)) No need to check if glob exists past the first expression. -- Steve > func_g.search = NULL; > - else if (glob) { > + else { > int not; > > func_g.type = filter_parse_regex(glob, strlen(glob),