From nobody Thu Feb 12 00:23:54 2026 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 92E95C77B6E for ; Wed, 12 Apr 2023 12:42:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231808AbjDLMmu (ORCPT ); Wed, 12 Apr 2023 08:42:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231689AbjDLMmS (ORCPT ); Wed, 12 Apr 2023 08:42:18 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F8047DBB; Wed, 12 Apr 2023 05:42:08 -0700 (PDT) Received: from dggpeml500021.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4PxMgk395czSrt2; Wed, 12 Apr 2023 20:38:10 +0800 (CST) Received: from huawei.com (10.175.127.227) by dggpeml500021.china.huawei.com (7.185.36.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Wed, 12 Apr 2023 20:42:06 +0800 From: Baokun Li To: CC: , , , , , , , , Subject: [PATCH v3 6/8] ext4: make ext4_es_insert_delayed_block return void Date: Wed, 12 Apr 2023 20:41:24 +0800 Message-ID: <20230412124126.2286716-7-libaokun1@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230412124126.2286716-1-libaokun1@huawei.com> References: <20230412124126.2286716-1-libaokun1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpeml500021.china.huawei.com (7.185.36.21) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Now it never fails when inserting a delay extent, so the return value in ext4_es_insert_delayed_block is no longer necessary, let it return void. Signed-off-by: Baokun Li --- V2->V3: New added. fs/ext4/extents_status.c | 23 ++++++----------------- fs/ext4/extents_status.h | 4 ++-- fs/ext4/inode.c | 7 ++----- 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index 1ba2dd14367c..047ec2fc4899 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -1980,17 +1980,14 @@ bool ext4_is_pending(struct inode *inode, ext4_lblk= _t lblk) * @lblk - logical block to be added * @allocated - indicates whether a physical cluster has been allocated for * the logical cluster that contains the block - * - * Returns 0 on success, negative error code on failure. */ -int ext4_es_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk, - bool allocated) +void ext4_es_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk, + bool allocated) { struct extent_status newes; - int err =3D 0; =20 if (EXT4_SB(inode->i_sb)->s_mount_state & EXT4_FC_REPLAY) - return 0; + return; =20 es_debug("add [%u/1) delayed to extent status tree of inode %lu\n", lblk, inode->i_ino); @@ -2005,24 +2002,16 @@ int ext4_es_insert_delayed_block(struct inode *inod= e, ext4_lblk_t lblk, write_lock(&EXT4_I(inode)->i_es_lock); =20 __es_remove_extent(inode, lblk, lblk, NULL); -retry: - err =3D __es_insert_extent(inode, &newes); - if (err =3D=3D -ENOMEM && __es_shrink(EXT4_SB(inode->i_sb), - 128, EXT4_I(inode))) - goto retry; - if (err !=3D 0) - goto error; + + /* We never return an error when inserting a delayed extent. */ + (void) __es_insert_extent(inode, &newes); =20 if (allocated) __insert_pending(inode, lblk); - -error: write_unlock(&EXT4_I(inode)->i_es_lock); =20 ext4_es_print_tree(inode); ext4_print_pending_tree(inode); - - return err; } =20 /* diff --git a/fs/ext4/extents_status.h b/fs/ext4/extents_status.h index 526a68890aa6..c22edb931f1b 100644 --- a/fs/ext4/extents_status.h +++ b/fs/ext4/extents_status.h @@ -249,8 +249,8 @@ extern void ext4_exit_pending(void); extern void ext4_init_pending_tree(struct ext4_pending_tree *tree); extern void ext4_remove_pending(struct inode *inode, ext4_lblk_t lblk); extern bool ext4_is_pending(struct inode *inode, ext4_lblk_t lblk); -extern int ext4_es_insert_delayed_block(struct inode *inode, ext4_lblk_t l= blk, - bool allocated); +extern void ext4_es_insert_delayed_block(struct inode *inode, ext4_lblk_t = lblk, + bool allocated); extern unsigned int ext4_es_delayed_clu(struct inode *inode, ext4_lblk_t l= blk, ext4_lblk_t len); extern void ext4_clear_inode_es(struct inode *inode); diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 3bd4d5bbf0aa..9fd3d526f591 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -1635,7 +1635,7 @@ static void ext4_print_free_blocks(struct inode *inod= e) static int ext4_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk) { struct ext4_sb_info *sbi =3D EXT4_SB(inode->i_sb); - int ret; + int ret =3D 0; bool allocated =3D false; bool reserved =3D false; =20 @@ -1677,10 +1677,7 @@ static int ext4_insert_delayed_block(struct inode *i= node, ext4_lblk_t lblk) } } =20 - ret =3D ext4_es_insert_delayed_block(inode, lblk, allocated); - if (ret && reserved) - ext4_da_release_space(inode, 1); - + ext4_es_insert_delayed_block(inode, lblk, allocated); errout: return ret; } --=20 2.31.1