From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B1E9C433EF for ; Thu, 30 Jun 2022 02:24:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230414AbiF3CYn (ORCPT ); Wed, 29 Jun 2022 22:24:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231396AbiF3CYi (ORCPT ); Wed, 29 Jun 2022 22:24:38 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D181F237E7 for ; Wed, 29 Jun 2022 19:24:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656555877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jTpWjatM3e8fY4ePrpnhi85t3mu1MuP1MyivO5RpYvM=; b=Btnbn6tFmSSJ+2JIxWAWmJ9gTIV2Sp5fVg1T9O7QdzCecvZbM+rbWNEDKxjI2UZ/bqT1dS 3Cno9FRsfP5ZvKlIU+fG95gQnuGX4G9Z8JiG3xTiWv4Pfq8qRgcnegAAl/YfCzbbXRe9Jr BP53aD/6cDPU38+xOmnVj/R3DWVWV6I= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-258-aSiGKChYMamuYGIzeOaQig-1; Wed, 29 Jun 2022 22:24:35 -0400 X-MC-Unique: aSiGKChYMamuYGIzeOaQig-1 Received: by mail-qv1-f70.google.com with SMTP id q36-20020a0c9127000000b00461e3828064so17081349qvq.12 for ; Wed, 29 Jun 2022 19:24:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=jTpWjatM3e8fY4ePrpnhi85t3mu1MuP1MyivO5RpYvM=; b=MZRtETi+mt0zVxJw1FnRMTw023SrErkOTC4uK6t4Oe4kM1wDmRnzJGKiO82shlbSrq ah7ie3ec5PmvsII6k5IeB/XURmUeVL4keIzKC5NFSV3OW5bc0MWJLqtqbODS2Fzxnf9P 8rJZqtwKDPq1igA3XHb7O6H3jfKoYx9HbqsfpfvtFsEvxgylXrXqwqRhSphytG7KGdna tmt3WkYIUa6WBlA9rVeq77iUgWwsQPCe6z2cLok+xTCOe3WegMYONvTzz5MrIZ2Bv+Q7 4vUftJBcQf9QBfw7wYjyYU2HotxuJfFzNlvgBo2MUTpEolxw0cF/ThXgtdGRpYoAYwjs PQ+A== X-Gm-Message-State: AJIora8OAlRseubtOqIg1LS4Upld23LUm7rW8/unO0IuOZlmfIGQzUM1 GcbXQqIDV2P5HgSbiZd7pRIXdpkKa4cx2hG3eq8IJcmIMzv4TuNjp3QrnelKpPIXXpxMs/2TT0c UdmIfU4bVkSVmb0xK3n3xFLEb X-Received: by 2002:a05:620a:2411:b0:6af:22e8:71d7 with SMTP id d17-20020a05620a241100b006af22e871d7mr4656783qkn.457.1656555874846; Wed, 29 Jun 2022 19:24:34 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vinpGqyYzYXampSsd0UFjmJV815VN5VbFI0BVtMhTOJsaq6mbWt/cEH/wui46wQSEunh0yEA== X-Received: by 2002:a05:620a:2411:b0:6af:22e8:71d7 with SMTP id d17-20020a05620a241100b006af22e871d7mr4656775qkn.457.1656555874643; Wed, 29 Jun 2022 19:24:34 -0700 (PDT) Received: from localhost.localdomain (024-205-208-113.res.spectrum.com. [24.205.208.113]) by smtp.gmail.com with ESMTPSA id b19-20020ae9eb13000000b006aee672937esm13952098qkg.37.2022.06.29.19.24.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 29 Jun 2022 19:24:34 -0700 (PDT) Subject: Re: [PATCH] tracing/histograms: Simplify create_hist_fields() To: Zheng Yejian , rostedt@goodmis.org, mingo@redhat.com, linux-kernel@vger.kernel.org, tom.zanussi@linux.intel.com Cc: stable@vger.kernel.org, zhangjinhao2@huawei.com References: <20220630013152.164871-1-zhengyejian1@huawei.com> From: Tom Rix Message-ID: Date: Wed, 29 Jun 2022 19:24:32 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20220630013152.164871-1-zhengyejian1@huawei.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 6/29/22 6:31 PM, Zheng Yejian wrote: > When I look into implements of create_hist_fields(), I think there can be > following two simplifications: > 1. If something wrong happened in parse_var_defs(), free_var_defs() would > have been called in it, so no need goto free again after calling it; > 2. After calling create_key_fields(), regardless of the value of 'ret', it > then always runs into 'out: ', so the judge of 'ret' is redundant. > > No functional changes. > > Signed-off-by: Zheng Yejian > --- > kernel/trace/trace_events_hist.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c > index 2784951e0fc8..832c4ccf41ab 100644 > --- a/kernel/trace/trace_events_hist.c > +++ b/kernel/trace/trace_events_hist.c > @@ -4454,7 +4454,7 @@ static int create_hist_fields(struct hist_trigger_data *hist_data, > > ret = parse_var_defs(hist_data); > if (ret) > - goto out; > + return ret; > > ret = create_val_fields(hist_data, file); > if (ret) > @@ -4465,8 +4465,7 @@ static int create_hist_fields(struct hist_trigger_data *hist_data, > goto out; > > ret = create_key_fields(hist_data, file); > - if (ret) > - goto out; > + > out: > free_var_defs(hist_data); Reviewed-by: Tom Rix >