From patchwork Wed Jul 26 09:33:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Zetao X-Patchwork-Id: 126038 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp130190vqo; Tue, 25 Jul 2023 19:20:59 -0700 (PDT) X-Google-Smtp-Source: APBJJlHJnVjhJZwwqzl5kJEBkmK5XG6Pkj6XlCHpdgFncLeIdoLp0O/VZnt7ymP+pHID7XuT+lSJ X-Received: by 2002:a17:902:bc85:b0:1b6:76ee:190b with SMTP id bb5-20020a170902bc8500b001b676ee190bmr843720plb.35.1690338059294; Tue, 25 Jul 2023 19:20:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690338059; cv=none; d=google.com; s=arc-20160816; b=MEIYKcHajuHlTJbmGUYgwP4w89ckDKRssaynP+qkeM3VnIS6/mPxtHCmadYwohssIs flm/2VKb0LiW5zj5GF04S9KfiLtnV3jGP6WCBF8vg30wv/tnl/hPFGcFk2YkDnraQZHp 9UFvANEuXBQSBQhlidMsJ8eTpMfo/UhOvcBsF6YeDyYfJTADFIfTGmcc2zfkY+ECFTmc l7UoREeFYzsvgtlgi0j7xM1vRD3SA/jnhwdLFsBymuCE9X1krHMYfExdLbUuf5j6YjA3 xG3rkSEQ6NnipNnt3B+yLDDDpE7Jilb2+t2D5eToOOhPsb+e6Htv9vrp/o0YG518NVEk 2qPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=hkfcu7Kin1hgAKeHYB7pqlhzALD2cV/B6tqG55DvHJ8=; fh=h3m58jzjV6J4jCWwA7w67cpElHzl8JADQiKQYig1pF4=; b=MdT+RzafvU+PQholHldumxabnEfeUkGPvmQCqygltUiuBE4m0HOH5vrb6sqvOBnlVd qJZl96nv7PFP2XO1+rft7x9HIaLoGZRNVh8tpu8gAKSwb2YZnLFM3CLztYTEoGQhr7d7 974jB38uK2ESkevWevoPLnuPAQqHN8UNuuTkrK01LqS531K1utjjGi6X5qBO2pxHXSA9 OyZSifNfRhWTGYGiIlzS5TRDiDjeSTiodXvOTioRlQDfYBaCwkOqR30uSBtsEhOYf50c xdI8Q67sta3rBX/VE0ajA7M6ZdBRGPYZ3jBi6luXwxRs1uiVAOvFwTOImKiyMkvOhsWw t2lA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kv16-20020a17090328d000b001adc5bc4d8asi11601367plb.572.2023.07.25.19.20.45; Tue, 25 Jul 2023 19:20:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230033AbjGZBct (ORCPT + 99 others); Tue, 25 Jul 2023 21:32:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229472AbjGZBcr (ORCPT ); Tue, 25 Jul 2023 21:32:47 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 383B126A2; Tue, 25 Jul 2023 18:32:46 -0700 (PDT) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.56]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4R9btT1Rb3zLntF; Wed, 26 Jul 2023 09:30:09 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemi500012.china.huawei.com (7.221.188.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Wed, 26 Jul 2023 09:32:43 +0800 From: Li Zetao To: , CC: , , Subject: [PATCH -next] ext4: NULL check before some freeing functions is not needed Date: Wed, 26 Jul 2023 09:33:30 +0000 Message-ID: <20230726093330.1389949-1-lizetao1@huawei.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.90.53.73] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemi500012.china.huawei.com (7.221.188.12) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772447921016566609 X-GMAIL-MSGID: 1772447921016566609 Fix below warnings reported by coccicheck: fs/ext4/super.c:2472:4-9: WARNING: NULL check before some freeing functions is not needed. fs/ext4/super.c:2057:2-7: WARNING: NULL check before some freeing functions is not needed. Signed-off-by: Li Zetao --- fs/ext4/super.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index b54c70e1a74e..27d5aea1f715 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -2053,9 +2053,7 @@ static int unnote_qf_name(struct fs_context *fc, int qtype) { struct ext4_fs_context *ctx = fc->fs_private; - if (ctx->s_qf_names[qtype]) - kfree(ctx->s_qf_names[qtype]); - + kfree(ctx->s_qf_names[qtype]); ctx->s_qf_names[qtype] = NULL; ctx->qname_spec |= 1 << qtype; ctx->spec |= EXT4_SPEC_JQUOTA; @@ -2468,8 +2466,7 @@ static int parse_options(struct fs_context *fc, char *options) param.size = v_len; ret = ext4_parse_param(fc, ¶m); - if (param.string) - kfree(param.string); + kfree(param.string); if (ret < 0) return ret; }