From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751943AbdEPIIk (ORCPT ); Tue, 16 May 2017 04:08:40 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:56726 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751585AbdEPIIP (ORCPT ); Tue, 16 May 2017 04:08:15 -0400 Date: Tue, 16 May 2017 13:37:11 +0530 From: "Naveen N. Rao" To: Steven Rostedt 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() References: <95a1ae9c5dc472fa8b23c0f2ce0ad8276f35d30e.1494702964.git.naveen.n.rao@linux.vnet.ibm.com> <20170515132210.5efab11c@gandalf.local.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170515132210.5efab11c@gandalf.local.home> User-Agent: Mutt/1.6.2 (2016-07-01) X-TM-AS-MML: disable x-cbid: 17051608-0052-0000-0000-0000023EBCE8 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17051608-0053-0000-0000-0000081B124D Message-Id: <20170516080711.GC3394@naverao1-tp.localdomain> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-05-16_03:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1705160071 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2017/05/15 01:22PM, Steven Rostedt wrote: > 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. :facepalm: I'll respin. Thanks. - Naveen