From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCF7CCD1299 for ; Wed, 10 Apr 2024 14:38:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0F2376B0087; Wed, 10 Apr 2024 10:38:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0389D6B0092; Wed, 10 Apr 2024 10:38:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B75A26B008C; Wed, 10 Apr 2024 10:38:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 92FE26B008A for ; Wed, 10 Apr 2024 10:38:36 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 54D9A807E9 for ; Wed, 10 Apr 2024 14:38:36 +0000 (UTC) X-FDA: 81993878232.27.8B4D61F Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by imf01.hostedemail.com (Postfix) with ESMTP id A028E40003 for ; Wed, 10 Apr 2024 14:38:31 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf01.hostedemail.com: domain of yi.zhang@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=yi.zhang@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712759914; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vlSVZYHGBCwe5po1YBBPtd9L9lS3Ca8QXEZWdubIRGM=; b=jygC124zjkUXylHPpD1kYld1Skk2jTgNjThLO+opuo6pUTBW51GfPmFMpdxgw5Iji5NmRG sDct5XdEwTuYjWQxm0VCYE+2Izie1mu8Dhiisw4Tj3GcBI3+djwYGi6ug2iTT03CN1WI+i snZRez8yVafzgi37L+58kh3glkEtDac= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf01.hostedemail.com: domain of yi.zhang@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=yi.zhang@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712759914; a=rsa-sha256; cv=none; b=egPU0yXdHjAsDnnPSc1R6IlEZ45W0HyNjcJ+vw7x3SPzJkyzrQjSsBQFJbDWte/QmmgPkE PJtwv0NwWtJl8FgvKowSuEjwD36HF4eZV7CXj/HSDPJnLRIK/BBVU+MfdJO+OiaqQIkJFZ NbTdwLXgNf67aXW+4oyvVcCgEGTUihA= Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4VF56M4263z4f3khJ for ; Wed, 10 Apr 2024 22:38:19 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id 61BDE1A0175 for ; Wed, 10 Apr 2024 22:38:26 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP1 (Coremail) with SMTP id cCh0CgAX6RFSpBZmcwR8Jg--.63000S5; Wed, 10 Apr 2024 22:38:26 +0800 (CST) From: Zhang Yi To: linux-ext4@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ritesh.list@gmail.com, hch@infradead.org, djwong@kernel.org, david@fromorbit.com, willy@infradead.org, zokeefe@google.com, yi.zhang@huawei.com, yi.zhang@huaweicloud.com, chengzhihao1@huawei.com, yukuai3@huawei.com, wangkefeng.wang@huawei.com Subject: [PATCH v4 01/34] ext4: factor out a common helper to query extent map Date: Wed, 10 Apr 2024 22:29:15 +0800 Message-Id: <20240410142948.2817554-2-yi.zhang@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240410142948.2817554-1-yi.zhang@huaweicloud.com> References: <20240410142948.2817554-1-yi.zhang@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:cCh0CgAX6RFSpBZmcwR8Jg--.63000S5 X-Coremail-Antispam: 1UD129KBjvJXoWxXr4rtF1xtFWfXw15Zry3CFg_yoW5XFWUpr ZxCryrCr1UWwsagayftr1UZFySk3W5trWqq397Wr1rA3W5CrnayF15tFySqF9rKrWxXw4Y qFWfKryrCw4fGrDanT9S1TB71UUUUUJqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUHGb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUGw A2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV W8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6rxl6s0DM2kKe7AKxVWUXVWUAwAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUXVWUAwAv7VC2z280aVAFwI0_Jr0_Gr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErc IFxwACI402YVCY1x02628vn2kIc2xKxwCY1x0262kKe7AKxVW8ZVWrXwCF04k20xvY0x0E wIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwCFI7km07C267AKxVWUXVWUAwC20s026c02F4 0E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_GFv_Wryl IxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW7JVWDJwCI42IY6xIIjxv20xvEc7CjxV AFwI0_Gr1j6F4UJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_ Gr1j6F4UJwCI42IY6I8E87Iv6xkF7I0E14v26F4UJVW0obIYCTnIWIevJa73UjIFyTuYvj TRm2NuUUUUU X-CM-SenderInfo: d1lo6xhdqjqx5xdzvxpfor3voofrz/ X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: A028E40003 X-Stat-Signature: qjq7faennuryigzopowtngy58q49bpqb X-HE-Tag: 1712759911-847477 X-HE-Meta: U2FsdGVkX18lYqst2t4MOInHJbu0CVaRL0Fk9PhVeJUkIXfEp/r7sCuwzLJz8w+BS9dQWVspMjklWSKzXJsKptc0cZ0HO/f9N+wHUtAvf2jHf2CQLX7c6UMh7EI93ZugIWr/AKsTlm4COanlphGSEEqFAHJXKl+c+57V5IoeK3KyriwDIMgN7wNw690qGnhqibL2TZ8cGbBHuC2TNf5fA7uKdbHnR+Ug7hsbsXGGmMek4GEiFiQzsNeNvERsTtNP0nsjX1f7owDas1uoy2y6wKhxBwu6kDew2GzOyfSzyki2GSPO0gHIc5bULgiI1t6yENsAFBw6CpCnRAHABvL6v0sxKrK1vleeYKy6Fy8mwNPul1E+h9lmqITCoRNM1Gsq1OCii0stzDoQ5yBEkQGm09v1Yn0/9sassdDzCjgK/Q/JN1XciEmkOfFI1Nc3A9w+03woJ+0CH83e2JFt4xPWp8sKWVyUhNr+IBbvpHrIIhORKJsvCxF9YcJ/wBl+y1yrIBtvweoK8zi6piXx0avsaXTf4pUtaKmWYH8dR++J8fc+SWLyHBoJnXf8V6zq5PMCQdv9i028Icu6j7t5yf4hElI2fb+z3084zQpotXimTpgLwU3n9HMBPw9alYw7VlcbVzNmnWGTT7uIbFuIqpYw0EKKZUqyKkddhv0WQ43RhojX0Gyh2mC6/72C9MtgzuQ3ywKOHfVoh5W3Ve2fFu1kmCO89PyLU4pt38Ks7uc2F/AnkfEGFhW0hqSbvWgoUsLab9dlWSHYBOKQOrHxvnRuIfibkrKxHkrkvxsuizFAtO7SNLf0hGFL68uMCadZdZuR/mbHftB4svJELTEesQPrSAR/R4EwCCdrM6k9PCBiYoIGkIFJuKkXIRiW3KhQwyamjaSdlmw9NDIVlXTVBdIDloyMPGBV1MsLd2kp/Dq8jqbpQFmiI5iGRqR6/NcHDh0MTqpj4fodLbqsPBkQ6oQ Mh8kimz3 pKkSWmwMEMvkZfggad9nJYA+Rs6YpYrWfsn/MBMR4MKbBvNaTCiyqCiXhsglOghqYIFiwq83+eHdZbctlD2pxvUks4ru4kdkWcr5Olh0fQ1Xswj0NSUSk5arf9UFP1XHzioEkWsRq/x10GB66UXprdZZbTZqHSW4ah/lGV1lhi0eDHBXzZgtPv4SwzQk4UdlPJxIUtya+4SOTLhrM7jRnfFbpbQ4rrWcy7ZwfNTyaPYtRn9DS1otrgQT41U/pu7Znqyc0p34sP9EpNjUe0KBMO/kLqrruEegbzD1p X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Zhang Yi Factor out a new common helper ext4_map_query_blocks() from the ext4_da_map_blocks(), it query and return the extent map status on the inode's extent path, no logic changes. Signed-off-by: Zhang Yi --- fs/ext4/inode.c | 57 +++++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 537803250ca9..6a41172c06e1 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -453,6 +453,35 @@ static void ext4_map_blocks_es_recheck(handle_t *handle, } #endif /* ES_AGGRESSIVE_TEST */ +static int ext4_map_query_blocks(handle_t *handle, struct inode *inode, + struct ext4_map_blocks *map) +{ + unsigned int status; + int retval; + + if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) + retval = ext4_ext_map_blocks(handle, inode, map, 0); + else + retval = ext4_ind_map_blocks(handle, inode, map, 0); + + if (retval <= 0) + return retval; + + if (unlikely(retval != map->m_len)) { + ext4_warning(inode->i_sb, + "ES len assertion failed for inode " + "%lu: retval %d != map->m_len %d", + inode->i_ino, retval, map->m_len); + WARN_ON(1); + } + + status = map->m_flags & EXT4_MAP_UNWRITTEN ? + EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN; + ext4_es_insert_extent(inode, map->m_lblk, map->m_len, + map->m_pblk, status); + return retval; +} + /* * The ext4_map_blocks() function tries to look up the requested blocks, * and returns if the blocks are already mapped. @@ -1744,33 +1773,11 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock, down_read(&EXT4_I(inode)->i_data_sem); if (ext4_has_inline_data(inode)) retval = 0; - else if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) - retval = ext4_ext_map_blocks(NULL, inode, map, 0); else - retval = ext4_ind_map_blocks(NULL, inode, map, 0); - if (retval < 0) { - up_read(&EXT4_I(inode)->i_data_sem); - return retval; - } - if (retval > 0) { - unsigned int status; - - if (unlikely(retval != map->m_len)) { - ext4_warning(inode->i_sb, - "ES len assertion failed for inode " - "%lu: retval %d != map->m_len %d", - inode->i_ino, retval, map->m_len); - WARN_ON(1); - } - - status = map->m_flags & EXT4_MAP_UNWRITTEN ? - EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN; - ext4_es_insert_extent(inode, map->m_lblk, map->m_len, - map->m_pblk, status); - up_read(&EXT4_I(inode)->i_data_sem); - return retval; - } + retval = ext4_map_query_blocks(NULL, inode, map); up_read(&EXT4_I(inode)->i_data_sem); + if (retval) + return retval; add_delayed: down_write(&EXT4_I(inode)->i_data_sem); -- 2.39.2