From nobody Thu Feb 12 00:23:53 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