From nobody Wed Feb 11 22:55:09 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 736A5C77B72 for ; Wed, 12 Apr 2023 12:42:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231735AbjDLMmV (ORCPT ); Wed, 12 Apr 2023 08:42:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230459AbjDLMmP (ORCPT ); Wed, 12 Apr 2023 08:42:15 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7C7C7A83; Wed, 12 Apr 2023 05:42:06 -0700 (PDT) Received: from dggpeml500021.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4PxMjF1XZ1zKxdQ; Wed, 12 Apr 2023 20:39:29 +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:03 +0800 From: Baokun Li To: CC: , , , , , , , , Subject: [PATCH v3 1/8] ext4: only update i_reserved_data_blocks on successful block allocation Date: Wed, 12 Apr 2023 20:41:19 +0800 Message-ID: <20230412124126.2286716-2-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" In our fault injection test, we create an ext4 file, migrate it to non-extent based file, then punch a hole and finally trigger a WARN_ON in the ext4_da_update_reserve_space(): EXT4-fs warning (device sda): ext4_da_update_reserve_space:369: ino 14, used 11 with only 10 reserved data blocks When writing back a non-extent based file, if we enable delalloc, the number of reserved blocks will be subtracted from the number of blocks mapped by ext4_ind_map_blocks(), and the extent status tree will be updated. We update the extent status tree by first removing the old extent_status and then inserting the new extent_status. If the block range we remove happens to be in an extent, then we need to allocate another extent_status with ext4_es_alloc_extent(). use old to remove to add new |----------|------------|------------| old extent_status The problem is that the allocation of a new extent_status failed due to a fault injection, and __es_shrink() did not get free memory, resulting in a return of -ENOMEM. Then do_writepages() retries after receiving -ENOMEM, we map to the same extent again, and the number of reserved blocks is again subtracted from the number of blocks in that extent. Since the blocks in the same extent are subtracted twice, we end up triggering WARN_ON at ext4_da_update_reserve_space() because used > ei->i_reserved_data_blocks. For non-extent based file, we update the number of reserved blocks after ext4_ind_map_blocks() is executed, which causes a problem that when we call ext4_ind_map_blocks() to create a block, it doesn't always create a block, but we always reduce the number of reserved blocks. So we move the logic for updating reserved blocks to ext4_ind_map_blocks() to ensure that the number of reserved blocks is updated only after we do succeed in allocating some new blocks. Fixes: 5f634d064c70 ("ext4: Fix quota accounting error with fallocate") Signed-off-by: Baokun Li Reviewed-by: Jan Kara --- V1->V2: Modify the patch description and add the Fixes tag. V2->V3: Remove the redundant judgment of count. fs/ext4/indirect.c | 8 ++++++++ fs/ext4/inode.c | 10 ---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c index c68bebe7ff4b..a9f3716119d3 100644 --- a/fs/ext4/indirect.c +++ b/fs/ext4/indirect.c @@ -651,6 +651,14 @@ int ext4_ind_map_blocks(handle_t *handle, struct inode= *inode, =20 ext4_update_inode_fsync_trans(handle, inode, 1); count =3D ar.len; + + /* + * Update reserved blocks/metadata blocks after successful block + * allocation which had been deferred till now. + */ + if (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) + ext4_da_update_reserve_space(inode, count, 1); + got_it: map->m_flags |=3D EXT4_MAP_MAPPED; map->m_pblk =3D le32_to_cpu(chain[depth-1].key); diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 97eb728cb958..33ae92f0ddfb 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -659,16 +659,6 @@ int ext4_map_blocks(handle_t *handle, struct inode *in= ode, */ ext4_clear_inode_state(inode, EXT4_STATE_EXT_MIGRATE); } - - /* - * Update reserved blocks/metadata blocks after successful - * block allocation which had been deferred till now. We don't - * support fallocate for non extent files. So we can update - * reserve space here. - */ - if ((retval > 0) && - (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE)) - ext4_da_update_reserve_space(inode, retval, 1); } =20 if (retval > 0) { --=20 2.31.1 From nobody Wed Feb 11 22:55:09 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 2494FC7619A for ; Wed, 12 Apr 2023 12:42:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231755AbjDLMma (ORCPT ); Wed, 12 Apr 2023 08:42:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231552AbjDLMmR (ORCPT ); Wed, 12 Apr 2023 08:42:17 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 086FE7AA3; Wed, 12 Apr 2023 05:42:07 -0700 (PDT) Received: from dggpeml500021.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4PxMgh2R37zSrW7; Wed, 12 Apr 2023 20:38:08 +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:04 +0800 From: Baokun Li To: CC: , , , , , , , , Subject: [PATCH v3 2/8] ext4: add a new helper to check if es must be kept Date: Wed, 12 Apr 2023 20:41:20 +0800 Message-ID: <20230412124126.2286716-3-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" A helper function is added to help determine if the current extent can be dropped, although only ext4_es_is_delayed() extents cannot be dropped currently. Suggested-by: Jan Kara Signed-off-by: Baokun Li --- V2->V3: Rename ext4_es_alloc_should_nofail to ext4_es_must_keep. fs/ext4/extents_status.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index 7bc221038c6c..f9dab2510bdc 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -448,6 +448,20 @@ static void ext4_es_list_del(struct inode *inode) spin_unlock(&sbi->s_es_lock); } =20 +/* + * Returns 1 indicates that we cannot fail to allocate memory for this + * extent_status and cannot reclaim, clear, or free the extent until + * its status changes. + */ +static inline int ext4_es_must_keep(struct extent_status *es) +{ + /* filemap, bigalloc, and seek_data/hole need to use it. */ + if (ext4_es_is_delayed(es)) + return 1; + + return 0; +} + static struct extent_status * ext4_es_alloc_extent(struct inode *inode, ext4_lblk_t lblk, ext4_lblk_t le= n, ext4_fsblk_t pblk) @@ -460,10 +474,8 @@ ext4_es_alloc_extent(struct inode *inode, ext4_lblk_t = lblk, ext4_lblk_t len, es->es_len =3D len; es->es_pblk =3D pblk; =20 - /* - * We don't count delayed extent because we never try to reclaim them - */ - if (!ext4_es_is_delayed(es)) { + /* We never try to reclaim a must kept extent, so we don't count it. */ + if (!ext4_es_must_keep(es)) { if (!EXT4_I(inode)->i_es_shk_nr++) ext4_es_list_add(inode); percpu_counter_inc(&EXT4_SB(inode->i_sb)-> @@ -481,8 +493,8 @@ static void ext4_es_free_extent(struct inode *inode, st= ruct extent_status *es) EXT4_I(inode)->i_es_all_nr--; percpu_counter_dec(&EXT4_SB(inode->i_sb)->s_es_stats.es_stats_all_cnt); =20 - /* Decrease the shrink counter when this es is not delayed */ - if (!ext4_es_is_delayed(es)) { + /* Decrease the shrink counter when this es is not a must be kept */ + if (!ext4_es_must_keep(es)) { BUG_ON(EXT4_I(inode)->i_es_shk_nr =3D=3D 0); if (!--EXT4_I(inode)->i_es_shk_nr) ext4_es_list_del(inode); @@ -853,7 +865,7 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lbl= k_t lblk, if (err =3D=3D -ENOMEM && __es_shrink(EXT4_SB(inode->i_sb), 128, EXT4_I(inode))) goto retry; - if (err =3D=3D -ENOMEM && !ext4_es_is_delayed(&newes)) + if (err =3D=3D -ENOMEM && !ext4_es_must_keep(&newes)) err =3D 0; =20 if (sbi->s_cluster_ratio > 1 && test_opt(inode->i_sb, DELALLOC) && @@ -1706,11 +1718,8 @@ static int es_do_reclaim_extents(struct ext4_inode_i= nfo *ei, ext4_lblk_t end, =20 (*nr_to_scan)--; node =3D rb_next(&es->rb_node); - /* - * We can't reclaim delayed extent from status tree because - * fiemap, bigallic, and seek_data/hole need to use it. - */ - if (ext4_es_is_delayed(es)) + /* We can't reclaim a must be kept extent from status tree. */ + if (ext4_es_must_keep(es)) goto next; if (ext4_es_is_referenced(es)) { ext4_es_clear_referenced(es); @@ -1774,7 +1783,7 @@ void ext4_clear_inode_es(struct inode *inode) while (node) { es =3D rb_entry(node, struct extent_status, rb_node); node =3D rb_next(node); - if (!ext4_es_is_delayed(es)) { + if (!ext4_es_must_keep(es)) { rb_erase(&es->rb_node, &tree->root); ext4_es_free_extent(inode, es); } --=20 2.31.1 From nobody Wed Feb 11 22:55:09 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 02D21C7619A for ; Wed, 12 Apr 2023 12:42:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231752AbjDLMm0 (ORCPT ); Wed, 12 Apr 2023 08:42:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230332AbjDLMmR (ORCPT ); Wed, 12 Apr 2023 08:42:17 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EF737AAE; Wed, 12 Apr 2023 05:42:08 -0700 (PDT) Received: from dggpeml500021.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4PxMh724xXz17Rrt; Wed, 12 Apr 2023 20:38:31 +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:04 +0800 From: Baokun Li To: CC: , , , , , , , , Subject: [PATCH v3 3/8] ext4: use __GFP_NOFAIL if allocating extents_status cannot fail Date: Wed, 12 Apr 2023 20:41:21 +0800 Message-ID: <20230412124126.2286716-4-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" If extent status tree update fails, we have inconsistency between what is stored in the extent status tree and what is stored on disk. And that can cause even data corruption issues in some cases. For extents that cannot be dropped we use __GFP_NOFAIL to allocate memory. And with the above logic, the undo operation in __es_remove_extent that may cause inconsistency if the split extent fails is unnecessary, so we remove it as well. Suggested-by: Jan Kara Signed-off-by: Baokun Li --- V2->V3: Define helper as a preparatory patch and simplify the code. fs/ext4/extents_status.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index f9dab2510bdc..a7c3200f9cbe 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -464,10 +464,15 @@ static inline int ext4_es_must_keep(struct extent_sta= tus *es) =20 static struct extent_status * ext4_es_alloc_extent(struct inode *inode, ext4_lblk_t lblk, ext4_lblk_t le= n, - ext4_fsblk_t pblk) + ext4_fsblk_t pblk, int nofail) { struct extent_status *es; - es =3D kmem_cache_alloc(ext4_es_cachep, GFP_ATOMIC); + gfp_t gfp_flags =3D GFP_ATOMIC; + + if (nofail) + gfp_flags |=3D __GFP_NOFAIL; + + es =3D kmem_cache_alloc(ext4_es_cachep, gfp_flags); if (es =3D=3D NULL) return NULL; es->es_lblk =3D lblk; @@ -804,7 +809,7 @@ static int __es_insert_extent(struct inode *inode, stru= ct extent_status *newes) } =20 es =3D ext4_es_alloc_extent(inode, newes->es_lblk, newes->es_len, - newes->es_pblk); + newes->es_pblk, ext4_es_must_keep(newes)); if (!es) return -ENOMEM; rb_link_node(&es->rb_node, parent, p); @@ -1361,8 +1366,6 @@ static int __es_remove_extent(struct inode *inode, ex= t4_lblk_t lblk, ext4_es_status(&orig_es)); err =3D __es_insert_extent(inode, &newes); if (err) { - es->es_lblk =3D orig_es.es_lblk; - es->es_len =3D orig_es.es_len; if ((err =3D=3D -ENOMEM) && __es_shrink(EXT4_SB(inode->i_sb), 128, EXT4_I(inode))) --=20 2.31.1 From nobody Wed Feb 11 22:55:09 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 21A63C77B76 for ; Wed, 12 Apr 2023 12:42:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231794AbjDLMmi (ORCPT ); Wed, 12 Apr 2023 08:42:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231574AbjDLMmR (ORCPT ); Wed, 12 Apr 2023 08:42:17 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40A557ABD; Wed, 12 Apr 2023 05:42:08 -0700 (PDT) Received: from dggpeml500021.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4PxMlP69SxzDsrS; Wed, 12 Apr 2023 20:41:21 +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:05 +0800 From: Baokun Li To: CC: , , , , , , , , Subject: [PATCH v3 4/8] ext4: make __es_remove_extent return void Date: Wed, 12 Apr 2023 20:41:22 +0800 Message-ID: <20230412124126.2286716-5-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 __es_remove_extent() cannot fail (it will always remove what it should, maybe more) so just make it return void. Suggested-by: Jan Kara Signed-off-by: Baokun Li --- V2->V3: New added. fs/ext4/extents_status.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index a7c3200f9cbe..5207d3a9c1ad 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -145,8 +145,8 @@ static struct kmem_cache *ext4_es_cachep; static struct kmem_cache *ext4_pending_cachep; =20 static int __es_insert_extent(struct inode *inode, struct extent_status *n= ewes); -static int __es_remove_extent(struct inode *inode, ext4_lblk_t lblk, - ext4_lblk_t end, int *reserved); +static void __es_remove_extent(struct inode *inode, ext4_lblk_t lblk, + ext4_lblk_t end, int *reserved); static int es_reclaim_extents(struct ext4_inode_info *ei, int *nr_to_scan); static int __es_shrink(struct ext4_sb_info *sbi, int nr_to_scan, struct ext4_inode_info *locked_ei); @@ -862,9 +862,7 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lbl= k_t lblk, ext4_es_insert_extent_check(inode, &newes); =20 write_lock(&EXT4_I(inode)->i_es_lock); - err =3D __es_remove_extent(inode, lblk, end, NULL); - if (err !=3D 0) - goto error; + __es_remove_extent(inode, lblk, end, NULL); retry: err =3D __es_insert_extent(inode, &newes); if (err =3D=3D -ENOMEM && __es_shrink(EXT4_SB(inode->i_sb), @@ -878,7 +876,6 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lbl= k_t lblk, status & EXTENT_STATUS_UNWRITTEN)) __revise_pending(inode, lblk, len); =20 -error: write_unlock(&EXT4_I(inode)->i_es_lock); =20 ext4_es_print_tree(inode); @@ -1311,11 +1308,10 @@ static unsigned int get_rsvd(struct inode *inode, e= xt4_lblk_t end, * * If @reserved is not NULL and delayed allocation is enabled, counts * block/cluster reservations freed by removing range and if bigalloc - * enabled cancels pending reservations as needed. Returns 0 on success, - * error code on failure. + * enabled cancels pending reservations as needed. */ -static int __es_remove_extent(struct inode *inode, ext4_lblk_t lblk, - ext4_lblk_t end, int *reserved) +static void __es_remove_extent(struct inode *inode, ext4_lblk_t lblk, + ext4_lblk_t end, int *reserved) { struct ext4_es_tree *tree =3D &EXT4_I(inode)->i_es_tree; struct rb_node *node; @@ -1334,9 +1330,9 @@ static int __es_remove_extent(struct inode *inode, ex= t4_lblk_t lblk, =20 es =3D __es_tree_search(&tree->root, lblk); if (!es) - goto out; + return; if (es->es_lblk > end) - goto out; + return; =20 /* Simply invalidate cache_es. */ tree->cache_es =3D NULL; @@ -1370,7 +1366,7 @@ static int __es_remove_extent(struct inode *inode, ex= t4_lblk_t lblk, __es_shrink(EXT4_SB(inode->i_sb), 128, EXT4_I(inode))) goto retry; - goto out; + return; } } else { es->es_lblk =3D end + 1; @@ -1429,8 +1425,6 @@ static int __es_remove_extent(struct inode *inode, ex= t4_lblk_t lblk, out_get_reserved: if (count_reserved) *reserved =3D get_rsvd(inode, end, es, &rc); -out: - return err; } =20 /* @@ -1469,7 +1463,7 @@ int ext4_es_remove_extent(struct inode *inode, ext4_l= blk_t lblk, * is reclaimed. */ write_lock(&EXT4_I(inode)->i_es_lock); - err =3D __es_remove_extent(inode, lblk, end, &reserved); + __es_remove_extent(inode, lblk, end, &reserved); write_unlock(&EXT4_I(inode)->i_es_lock); ext4_es_print_tree(inode); ext4_da_release_space(inode, reserved); @@ -2012,9 +2006,7 @@ int ext4_es_insert_delayed_block(struct inode *inode,= ext4_lblk_t lblk, =20 write_lock(&EXT4_I(inode)->i_es_lock); =20 - err =3D __es_remove_extent(inode, lblk, lblk, NULL); - if (err !=3D 0) - goto error; + __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), --=20 2.31.1 From nobody Wed Feb 11 22:55:09 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 259F4C77B72 for ; Wed, 12 Apr 2023 12:42:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230340AbjDLMml (ORCPT ); Wed, 12 Apr 2023 08:42:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231596AbjDLMmS (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 3FCEA7ABA; 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 4PxMjH2NfLzKxhw; Wed, 12 Apr 2023 20:39:31 +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:05 +0800 From: Baokun Li To: CC: , , , , , , , , Subject: [PATCH v3 5/8] ext4: make ext4_es_remove_extent return void Date: Wed, 12 Apr 2023 20:41:23 +0800 Message-ID: <20230412124126.2286716-6-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" After __es_remove_extent returns void, the return value in ext4_es_remove_extent is also unnecessary, so make it return void too. Signed-off-by: Baokun Li --- V2->V3: New added. fs/ext4/extents.c | 34 ++++++---------------------------- fs/ext4/extents_status.c | 12 +++++------- fs/ext4/extents_status.h | 4 ++-- fs/ext4/inline.c | 12 ++---------- fs/ext4/inode.c | 8 ++------ 5 files changed, 17 insertions(+), 53 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 3559ea6b0781..e6695fec59af 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4403,15 +4403,8 @@ int ext4_ext_truncate(handle_t *handle, struct inode= *inode) =20 last_block =3D (inode->i_size + sb->s_blocksize - 1) >> EXT4_BLOCK_SIZE_BITS(sb); -retry: - err =3D ext4_es_remove_extent(inode, last_block, - EXT_MAX_BLOCKS - last_block); - if (err =3D=3D -ENOMEM) { - memalloc_retry_wait(GFP_ATOMIC); - goto retry; - } - if (err) - return err; + ext4_es_remove_extent(inode, last_block, EXT_MAX_BLOCKS - last_block); + retry_remove_space: err =3D ext4_ext_remove_space(inode, last_block, EXT_MAX_BLOCKS - 1); if (err =3D=3D -ENOMEM) { @@ -5363,13 +5356,7 @@ static int ext4_collapse_range(struct file *file, lo= ff_t offset, loff_t len) =20 down_write(&EXT4_I(inode)->i_data_sem); ext4_discard_preallocations(inode, 0); - - ret =3D ext4_es_remove_extent(inode, punch_start, - EXT_MAX_BLOCKS - punch_start); - if (ret) { - up_write(&EXT4_I(inode)->i_data_sem); - goto out_stop; - } + ext4_es_remove_extent(inode, punch_start, EXT_MAX_BLOCKS - punch_start); =20 ret =3D ext4_ext_remove_space(inode, punch_start, punch_stop - 1); if (ret) { @@ -5554,12 +5541,7 @@ static int ext4_insert_range(struct file *file, loff= _t offset, loff_t len) ext4_free_ext_path(path); } =20 - ret =3D ext4_es_remove_extent(inode, offset_lblk, - EXT_MAX_BLOCKS - offset_lblk); - if (ret) { - up_write(&EXT4_I(inode)->i_data_sem); - goto out_stop; - } + ext4_es_remove_extent(inode, offset_lblk, EXT_MAX_BLOCKS - offset_lblk); =20 /* * if offset_lblk lies in a hole which is at start of file, use @@ -5617,12 +5599,8 @@ ext4_swap_extents(handle_t *handle, struct inode *in= ode1, BUG_ON(!inode_is_locked(inode1)); BUG_ON(!inode_is_locked(inode2)); =20 - *erp =3D ext4_es_remove_extent(inode1, lblk1, count); - if (unlikely(*erp)) - return 0; - *erp =3D ext4_es_remove_extent(inode2, lblk2, count); - if (unlikely(*erp)) - return 0; + ext4_es_remove_extent(inode1, lblk1, count); + ext4_es_remove_extent(inode2, lblk2, count); =20 while (count) { struct ext4_extent *ex1, *ex2, tmp_ex; diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index 5207d3a9c1ad..1ba2dd14367c 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -1435,24 +1435,23 @@ static void __es_remove_extent(struct inode *inode,= ext4_lblk_t lblk, * @len - number of blocks to remove * * Reduces block/cluster reservation count and for bigalloc cancels pending - * reservations as needed. Returns 0 on success, error code on failure. + * reservations as needed. */ -int ext4_es_remove_extent(struct inode *inode, ext4_lblk_t lblk, - ext4_lblk_t len) +void ext4_es_remove_extent(struct inode *inode, ext4_lblk_t lblk, + ext4_lblk_t len) { ext4_lblk_t end; - int err =3D 0; int reserved =3D 0; =20 if (EXT4_SB(inode->i_sb)->s_mount_state & EXT4_FC_REPLAY) - return 0; + return; =20 trace_ext4_es_remove_extent(inode, lblk, len); es_debug("remove [%u/%u) from extent status tree of inode %lu\n", lblk, len, inode->i_ino); =20 if (!len) - return err; + return; =20 end =3D lblk + len - 1; BUG_ON(end < lblk); @@ -1467,7 +1466,6 @@ int ext4_es_remove_extent(struct inode *inode, ext4_l= blk_t lblk, write_unlock(&EXT4_I(inode)->i_es_lock); ext4_es_print_tree(inode); ext4_da_release_space(inode, reserved); - return err; } =20 static int __es_shrink(struct ext4_sb_info *sbi, int nr_to_scan, diff --git a/fs/ext4/extents_status.h b/fs/ext4/extents_status.h index 4ec30a798260..526a68890aa6 100644 --- a/fs/ext4/extents_status.h +++ b/fs/ext4/extents_status.h @@ -133,8 +133,8 @@ extern int ext4_es_insert_extent(struct inode *inode, e= xt4_lblk_t lblk, extern void ext4_es_cache_extent(struct inode *inode, ext4_lblk_t lblk, ext4_lblk_t len, ext4_fsblk_t pblk, unsigned int status); -extern int ext4_es_remove_extent(struct inode *inode, ext4_lblk_t lblk, - ext4_lblk_t len); +extern void ext4_es_remove_extent(struct inode *inode, ext4_lblk_t lblk, + ext4_lblk_t len); extern void ext4_es_find_extent_range(struct inode *inode, int (*match_fn)(struct extent_status *es), ext4_lblk_t lblk, ext4_lblk_t end, diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 1602d74b5eeb..dc88ec0e6611 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -1955,16 +1955,8 @@ int ext4_inline_data_truncate(struct inode *inode, i= nt *has_inline) * the extent status cache must be cleared to avoid leaving * behind stale delayed allocated extent entries */ - if (!ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) { -retry: - err =3D ext4_es_remove_extent(inode, 0, EXT_MAX_BLOCKS); - if (err =3D=3D -ENOMEM) { - memalloc_retry_wait(GFP_ATOMIC); - goto retry; - } - if (err) - goto out_error; - } + if (!ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) + ext4_es_remove_extent(inode, 0, EXT_MAX_BLOCKS); =20 /* Clear the content in the xattr space. */ if (inline_size > EXT4_MIN_INLINE_DATA_SIZE) { diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 33ae92f0ddfb..3bd4d5bbf0aa 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4026,12 +4026,8 @@ int ext4_punch_hole(struct file *file, loff_t offset= , loff_t length) down_write(&EXT4_I(inode)->i_data_sem); ext4_discard_preallocations(inode, 0); =20 - ret =3D ext4_es_remove_extent(inode, first_block, - stop_block - first_block); - if (ret) { - up_write(&EXT4_I(inode)->i_data_sem); - goto out_stop; - } + ext4_es_remove_extent(inode, first_block, + stop_block - first_block); =20 if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) ret =3D ext4_ext_remove_space(inode, first_block, --=20 2.31.1 From nobody Wed Feb 11 22:55:09 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 From nobody Wed Feb 11 22:55:09 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 8D11CC77B72 for ; Wed, 12 Apr 2023 12:42:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231682AbjDLMmo (ORCPT ); Wed, 12 Apr 2023 08:42:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231695AbjDLMmT (ORCPT ); Wed, 12 Apr 2023 08:42:19 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EEB87EC4; Wed, 12 Apr 2023 05:42:09 -0700 (PDT) Received: from dggpeml500021.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4PxMh92qvYz17S81; Wed, 12 Apr 2023 20:38:33 +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:07 +0800 From: Baokun Li To: CC: , , , , , , , , Subject: [PATCH v3 7/8] ext4: make ext4_es_insert_extent return void Date: Wed, 12 Apr 2023 20:41:25 +0800 Message-ID: <20230412124126.2286716-8-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" In ext4_es_insert_extent, for extents that are not must be kept, the return value is set to 0 even if the allocation returns -ENOMEM, and now inserting an extent that must be kept never fails, hence ext4_es_insert_extent never returns an error either, so let it return void. Signed-off-by: Baokun Li --- V2->V3: New added. fs/ext4/extents.c | 5 +++-- fs/ext4/extents_status.c | 16 +++++----------- fs/ext4/extents_status.h | 6 +++--- fs/ext4/inode.c | 21 ++++++--------------- 4 files changed, 17 insertions(+), 31 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index e6695fec59af..d555ed924f37 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -3136,8 +3136,9 @@ static int ext4_zeroout_es(struct inode *inode, struc= t ext4_extent *ex) if (ee_len =3D=3D 0) return 0; =20 - return ext4_es_insert_extent(inode, ee_block, ee_len, ee_pblock, - EXTENT_STATUS_WRITTEN); + ext4_es_insert_extent(inode, ee_block, ee_len, ee_pblock, + EXTENT_STATUS_WRITTEN); + return 0; } =20 /* FIXME!! we need to try to merge to left or right after zero-out */ diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index 047ec2fc4899..ab345523c8b1 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -823,12 +823,10 @@ static int __es_insert_extent(struct inode *inode, st= ruct extent_status *newes) /* * ext4_es_insert_extent() adds information to an inode's extent * status tree. - * - * Return 0 on success, error code on failure. */ -int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, - ext4_lblk_t len, ext4_fsblk_t pblk, - unsigned int status) +void ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, + ext4_lblk_t len, ext4_fsblk_t pblk, + unsigned int status) { struct extent_status newes; ext4_lblk_t end =3D lblk + len - 1; @@ -836,13 +834,13 @@ int ext4_es_insert_extent(struct inode *inode, ext4_l= blk_t lblk, struct ext4_sb_info *sbi =3D EXT4_SB(inode->i_sb); =20 if (EXT4_SB(inode->i_sb)->s_mount_state & EXT4_FC_REPLAY) - return 0; + return; =20 es_debug("add [%u/%u) %llu %x to extent status tree of inode %lu\n", lblk, len, pblk, status, inode->i_ino); =20 if (!len) - return 0; + return; =20 BUG_ON(end < lblk); =20 @@ -868,8 +866,6 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lbl= k_t lblk, if (err =3D=3D -ENOMEM && __es_shrink(EXT4_SB(inode->i_sb), 128, EXT4_I(inode))) goto retry; - if (err =3D=3D -ENOMEM && !ext4_es_must_keep(&newes)) - err =3D 0; =20 if (sbi->s_cluster_ratio > 1 && test_opt(inode->i_sb, DELALLOC) && (status & EXTENT_STATUS_WRITTEN || @@ -879,8 +875,6 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lbl= k_t lblk, write_unlock(&EXT4_I(inode)->i_es_lock); =20 ext4_es_print_tree(inode); - - return err; } =20 /* diff --git a/fs/ext4/extents_status.h b/fs/ext4/extents_status.h index c22edb931f1b..d9847a4a25db 100644 --- a/fs/ext4/extents_status.h +++ b/fs/ext4/extents_status.h @@ -127,9 +127,9 @@ extern int __init ext4_init_es(void); extern void ext4_exit_es(void); extern void ext4_es_init_tree(struct ext4_es_tree *tree); =20 -extern int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, - ext4_lblk_t len, ext4_fsblk_t pblk, - unsigned int status); +extern void ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, + ext4_lblk_t len, ext4_fsblk_t pblk, + unsigned int status); extern void ext4_es_cache_extent(struct inode *inode, ext4_lblk_t lblk, ext4_lblk_t len, ext4_fsblk_t pblk, unsigned int status); diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 9fd3d526f591..fc80791c239c 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -594,10 +594,8 @@ int ext4_map_blocks(handle_t *handle, struct inode *in= ode, ext4_es_scan_range(inode, &ext4_es_is_delayed, map->m_lblk, map->m_lblk + map->m_len - 1)) status |=3D EXTENT_STATUS_DELAYED; - ret =3D ext4_es_insert_extent(inode, map->m_lblk, - map->m_len, map->m_pblk, status); - if (ret < 0) - retval =3D ret; + ext4_es_insert_extent(inode, map->m_lblk, map->m_len, + map->m_pblk, status); } up_read((&EXT4_I(inode)->i_data_sem)); =20 @@ -706,12 +704,8 @@ int ext4_map_blocks(handle_t *handle, struct inode *in= ode, ext4_es_scan_range(inode, &ext4_es_is_delayed, map->m_lblk, map->m_lblk + map->m_len - 1)) status |=3D EXTENT_STATUS_DELAYED; - ret =3D ext4_es_insert_extent(inode, map->m_lblk, map->m_len, - map->m_pblk, status); - if (ret < 0) { - retval =3D ret; - goto out_sem; - } + ext4_es_insert_extent(inode, map->m_lblk, map->m_len, + map->m_pblk, status); } =20 out_sem: @@ -1776,7 +1770,6 @@ static int ext4_da_map_blocks(struct inode *inode, se= ctor_t iblock, set_buffer_new(bh); set_buffer_delay(bh); } else if (retval > 0) { - int ret; unsigned int status; =20 if (unlikely(retval !=3D map->m_len)) { @@ -1789,10 +1782,8 @@ static int ext4_da_map_blocks(struct inode *inode, s= ector_t iblock, =20 status =3D map->m_flags & EXT4_MAP_UNWRITTEN ? EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN; - ret =3D ext4_es_insert_extent(inode, map->m_lblk, map->m_len, - map->m_pblk, status); - if (ret !=3D 0) - retval =3D ret; + ext4_es_insert_extent(inode, map->m_lblk, map->m_len, + map->m_pblk, status); } =20 out_unlock: --=20 2.31.1 From nobody Wed Feb 11 22:55:09 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 9DB08C77B6E for ; Wed, 12 Apr 2023 12:42:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229491AbjDLMmq (ORCPT ); Wed, 12 Apr 2023 08:42:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231709AbjDLMmT (ORCPT ); Wed, 12 Apr 2023 08:42:19 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B48D67EC8; Wed, 12 Apr 2023 05:42:09 -0700 (PDT) Received: from dggpeml500021.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4PxMjJ6LwzzKxnV; Wed, 12 Apr 2023 20:39:32 +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:07 +0800 From: Baokun Li To: CC: , , , , , , , , Subject: [PATCH v3 8/8] ext4: make ext4_zeroout_es return void Date: Wed, 12 Apr 2023 20:41:26 +0800 Message-ID: <20230412124126.2286716-9-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" After ext4_es_insert_extent returns void, the return value in ext4_zeroout_es is also unnecessary, so make it return void too. Signed-off-by: Baokun Li --- V2->V3: New added. fs/ext4/extents.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index d555ed924f37..6c3080830b00 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -3123,7 +3123,7 @@ void ext4_ext_release(struct super_block *sb) #endif } =20 -static int ext4_zeroout_es(struct inode *inode, struct ext4_extent *ex) +static void ext4_zeroout_es(struct inode *inode, struct ext4_extent *ex) { ext4_lblk_t ee_block; ext4_fsblk_t ee_pblock; @@ -3134,11 +3134,10 @@ static int ext4_zeroout_es(struct inode *inode, str= uct ext4_extent *ex) ee_pblock =3D ext4_ext_pblock(ex); =20 if (ee_len =3D=3D 0) - return 0; + return; =20 ext4_es_insert_extent(inode, ee_block, ee_len, ee_pblock, EXTENT_STATUS_WRITTEN); - return 0; } =20 /* FIXME!! we need to try to merge to left or right after zero-out */ @@ -3288,7 +3287,7 @@ static int ext4_split_extent_at(handle_t *handle, err =3D ext4_ext_dirty(handle, inode, path + path->p_depth); if (!err) /* update extent status tree */ - err =3D ext4_zeroout_es(inode, &zero_ex); + ext4_zeroout_es(inode, &zero_ex); /* If we failed at this point, we don't know in which * state the extent tree exactly is so don't try to fix * length of the original extent as it may do even more @@ -3641,9 +3640,8 @@ static int ext4_ext_convert_to_initialized(handle_t *= handle, out: /* If we have gotten a failure, don't zero out status tree */ if (!err) { - err =3D ext4_zeroout_es(inode, &zero_ex1); - if (!err) - err =3D ext4_zeroout_es(inode, &zero_ex2); + ext4_zeroout_es(inode, &zero_ex1); + ext4_zeroout_es(inode, &zero_ex2); } return err ? err : allocated; } --=20 2.31.1