From patchwork Thu Feb 9 19:48:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54895 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp290466wrn; Thu, 9 Feb 2023 04:00:58 -0800 (PST) X-Google-Smtp-Source: AK7set/T2LhJZ5zuxBkKwl+UW0yIUol+P8SPR0944BH0pZEmG+nC8GfmGgyCBj44/aW2OuKSZnBO X-Received: by 2002:a17:90a:1918:b0:22c:4b18:4ebb with SMTP id 24-20020a17090a191800b0022c4b184ebbmr5270576pjg.29.1675944058306; Thu, 09 Feb 2023 04:00:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675944058; cv=none; d=google.com; s=arc-20160816; b=wzVwTlDubPkCat6beCeaXABR8tN3wg2bmDe4l0HzN64sXsfxFg1AFEg/IL3AKSD7N0 wkDt5XfcWN5iE5hvu0FRxOWDdWTHXBM4itk9VlaESr2lygIxX9zV1TD59uO6V7aDT4tY 3/VhAsv/qbRNLJlPgxliwSb6dVHQjWajA4jmxCsyssB3WQawhrVbw0TFEYKQH7zGrZbf nRDtxM+a+3GFh5k67v6RMtYT/fdkiveRxC6O6KPCkCi3MTd+/dt2Av2aN+QHbzpIadeU GcbRISsg7pDLXlB/2dqIgDyr5KyY5U+mT6E4pxg+3FCsIFSRVmhp9Olb5s2r20qokgIN x11g== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=bTLpPxXzD/pPUtTjuFKMjey5G5BZ0JbRwZAora190Wo=; b=RA+F9PqFaIFzHkIEvWDAjinZzWu79TdNa0XT/IPSS6XjeVAVpQ96wMy96/Ea2oik3G qkVXvGFIsaqIvTiGsyP6OgE2GbUCwHrnqrq42oUMWaUx8ohhjmhoOkQ3hmci1xbejiaE cXP/FLPlZC8o7U/hoxZ//bN7MWviukBlm8q3Bp8q3RzZFAoM0Hr3FFkSxQy0sga41f2U CkbIIUdoAOw2RDpNDfD47kwRclwTjxo2PL4lOCqduE9YGO6VddJtYxtPyDJfMnh8GCWe v/VsXdPApUiNcN/NilzeNLVBUotEF5bDhjeA1uB+v6A4ryM8b96nMnmkPBC1tVkMLDeC RjMQ== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mu6-20020a17090b388600b0022bf337cea4si2200658pjb.44.2023.02.09.04.00.45; Thu, 09 Feb 2023 04:00:58 -0800 (PST) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229837AbjBIL55 (ORCPT + 99 others); Thu, 9 Feb 2023 06:57:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229842AbjBIL4P (ORCPT ); Thu, 9 Feb 2023 06:56:15 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2634D5C49A; Thu, 9 Feb 2023 03:46:33 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PCFSg1N6jz4f3v77; Thu, 9 Feb 2023 19:46:27 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S14; Thu, 09 Feb 2023 19:46:29 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 12/21] ext4: remove unnecessary check in ext4_mb_new_blocks Date: Fri, 10 Feb 2023 03:48:16 +0800 Message-Id: <20230209194825.511043-13-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230209194825.511043-1-shikemeng@huaweicloud.com> References: <20230209194825.511043-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAn3rEQ3eRjgb0tDQ--.53508S14 X-Coremail-Antispam: 1UD129KBjvdXoW7JFyrZFW5uw43Zr15KF48Zwb_yoWDtrb_GF ykA348Ca1ftw1Ska1vyr40qF1YgFs5tF18XFZrKr43ZF15X3yru34kArs3ZF1kWay2yasx Ww1rAFy0kr4S9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbSxYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUIL05UUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757354716560093436?= X-GMAIL-MSGID: =?utf-8?q?1757354716560093436?= 1. remove unnecessary ac check: We always go to out tag before ac is successfully allocated, then we can move out tag after free of ac and remove NULL check of ac. 2. remove unnecessary *errp check: We always go to errout tag if *errp is non-zero, then we can move errout tag into error handle if *errp is non-zero. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 74da24c9bf14..bdabe0d81d4a 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5641,16 +5641,15 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle, *errp = -ENOSPC; } -errout: if (*errp) { +errout: ac->ac_b_ex.fe_len = 0; ar->len = 0; ext4_mb_show_ac(ac); } ext4_mb_release_context(ac); + kmem_cache_free(ext4_ac_cachep, ac); out: - if (ac) - kmem_cache_free(ext4_ac_cachep, ac); if (inquota && ar->len < inquota) dquot_free_block(ar->inode, EXT4_C2B(sbi, inquota - ar->len)); if (!ar->len) {