From patchwork Tue Feb 4 23:12:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 13960170 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 DFC45C02193 for ; Tue, 4 Feb 2025 23:12:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BC7BA28000E; Tue, 4 Feb 2025 18:12:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7E68A28000D; Tue, 4 Feb 2025 18:12:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 43E7D280013; Tue, 4 Feb 2025 18:12:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id DB0EC28000E for ; Tue, 4 Feb 2025 18:12:18 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 7D6ED80303 for ; Tue, 4 Feb 2025 23:12:18 +0000 (UTC) X-FDA: 83083812756.02.7D490FD Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf29.hostedemail.com (Postfix) with ESMTP id C42F5120008 for ; Tue, 4 Feb 2025 23:12:16 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=dwYwqC0B; spf=none (imf29.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=quarantine) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738710736; h=from:from:sender: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:dkim-signature; bh=Z9eItY4c7G0s+c+amJ06bcyD3TNKrS6Yw3t1FzanFdU=; b=tvZoae0PNnvXmj59NdM/FeVuItlNBQuz0FFuYjivC2C2MszY7HOSZ6SyXOVLFkVolgYL15 9Ezg3CtWbQdOf+h9xzT5USk4Uy0GyZ4l2tJP9Yho69KyxJT8LF7hqfLf79NSGUgQCBHA8B XnHfyHRlYMAylu1NJmyWUSpu4z6q8Fg= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=dwYwqC0B; spf=none (imf29.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=quarantine) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738710736; a=rsa-sha256; cv=none; b=cJHvLICNS9XRHn1xcjbP7wkocsOxUEZCv4bJHLBvyBoFI0pmKGeZfu3UDbo+wlnKL3dzxD +frOqmYTXzhJBtD61oI1Rp3Qp8a9XE/Lxl/oU/ohT6opyoJmXAWT1IWHyi41sxrbJI1f+q JCjw9xbHUz0SngQRDD6bkdHLgEo7nk4= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=Z9eItY4c7G0s+c+amJ06bcyD3TNKrS6Yw3t1FzanFdU=; b=dwYwqC0BnaxfmaHsYRpSVX1szZ y51ea1k/HUWuGbfBMjZT8cR+F3m8SputDuamldmdZf26OFtaPx0ElsPayezYJxgw5K2dqiPUuWrgS UJwLbSyAoStA48qFVkBvCVCtSVR4ODs+VlzjWMsE33dibGXHO0jLRbZyVe4qM4di5obEtKYv3Rg+0 nBqbJHk/Lou9nFRSKHo1AS/uxHZASXTQ7zj3S1vbwUFgoeF0JCya92/amtnBc5LMYrhRoNzQlEpIs Qx+Mz+ZbBjWgGnIVp7mVUFaVm60IxAVsd/bddgwX6rQogTzV7PwUcb8tsSLx/dxLiQO8+lkMBa9dO 8hsBmURw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tfS5T-00000001nhM-14jK; Tue, 04 Feb 2025 23:12:11 +0000 From: Luis Chamberlain To: hare@suse.de, willy@infradead.org, dave@stgolabs.net, david@fromorbit.com, djwong@kernel.org, kbusch@kernel.org Cc: john.g.garry@oracle.com, hch@lst.de, ritesh.list@gmail.com, linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-block@vger.kernel.org, gost.dev@samsung.com, p.raghav@samsung.com, da.gomez@samsung.com, kernel@pankajraghav.com, mcgrof@kernel.org Subject: [PATCH v2 1/8] fs/buffer: simplify block_read_full_folio() with bh_offset() Date: Tue, 4 Feb 2025 15:12:02 -0800 Message-ID: <20250204231209.429356-2-mcgrof@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250204231209.429356-1-mcgrof@kernel.org> References: <20250204231209.429356-1-mcgrof@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: C42F5120008 X-Rspamd-Server: rspam02 X-Stat-Signature: oasf6mcq9f5351ent8ikt5mmcob5p6i6 X-Rspamd-Pre-Result: action=add header; module=dmarc; Action set by DMARC X-Rspam-User: X-Rspam: Yes X-HE-Tag: 1738710736-944621 X-HE-Meta: U2FsdGVkX18QHHw3H/6hPpqX+UmBvjcZjwj7njLm/He1ZqPCOd6DzwRd0/6l9X/Exl2tyYhnLCE9QKp/WH9dg3UQepXOmLMn3a14PPGl0qwX+SeYQWcwrCM0XInOuZwydshrOJY77Ojw1/cSJq10iolEZ5HnRmmVAJxKmrT4FfdRewj+8l0RemBZi2b8Ktbl3xzZlp0xnnyD5acxHQvmsSU+hk0dkbWDMsf1VnPLCKCIhBfMhWTVQ8EulQ+1D2q0zlGXZAm3G0lWK6RJ2HWqSDoKTaqmn2eJuCSPLR7DAtRW90jK18U670qimxBD53owLID9sz5e5gd0ctXu+tTeWOGBGhDfc9lpKgrFxroDj3a9UQNJ7/9esJCJ9g/qy4mQZ1ySFFpI9OjgQxTMP3Uykrmx5vPRtnF90tLjh+pVd6xe67x4jEGgXjSxdyVt52k9GHdpB88j6jH60pXsgp7Qw/+qi1Anm1Ad8xrgESm4MUH+vvQyX3BOex7ndNBeB7r0kiHRRN0vN/z52MSm7l4Rt3ekcPPBHR0kDiO75IHlVQ4O7bt4EdPyPzjU5aPW/oiEc4fX6NvMaRZYermC8zS3dqBQKHyNrwxQo+KDe1EYsI9XssGqh+rcSB8Ya4JNLii50aBrE+5EbJXlZm6DxvuPmmboj6V+xK/emCpEgLFzRplpC8pXerpVHkLCn8lRJMtWN0wFhk25vq1jvltkXvGfDJiWv8BQyjaDlVmnL1a7baH/r1LV85YUwe2j2eQssBHjSnhjjfnwY0nYtI21aURYGo0h0OA2+Mqgy6o1lzl6qVA/gjY5wxBQkg8YQN3ZF+QPeCJvHGE6DL/p+9NMaQcsVwlpjCwnQYroPqNlqiw03jfejTQSmSBWJ759R+udkuiWfirZ0Cf9mueFaAQsU2mfmhvK/FX8LefRYclbgFqgz1RK3Y7bCWKyx4X2pzF+ajCdOsPSWisLowaWg/sfdWa tenU6fGN K4dmXMT1h0dIP7v+L9ERqMNYvNbGnHNv+19SnH9pvaKnfaq5OMzcQG0x9DP8gjy4mda2xpCsT7a7AMvEQJ2DR4zHkDdqg3x92K/qhyp3VrGDTHXAJikVt99cvZKqZnQ9F0oCiQVPh6SGSqeVncSXmFD4oj4V0MW142FM6Ryn6A7bisd8xzxyplO9LxVVdgfvj4QW4uV456Tp9NZ6KV5xWzmF1G8cP7Sjo7HpHTq9cK1m8MVaOLm9la8x2ddPd6nzscxUvZ7FHLKhRiCtxhKdY+xa3ge8HsxZ6kA6SbL9dKPrIlpLaj+ILVjjbZBwdYMqiik4r9n5pQhMnOWaXYyxLJxfUsMGXPZP+2M6/b/5KteNHlrywnVcQjKvDRDOpnfYSvSBWOK75nN4iAyk7gXzUXYVNrn1LJtrFKtSXfWzJzed1DJq8NFTVAXeoybcGg6h2ji8m6FaCr2pf4DW6AX06FDLoMZH8UsMcqe5IvQCaWzRYQA7i9JmCupal09xk365U1JISyk5EGi5LzbWI+vJs8tHvStTTQJ5oSvbGqgQWZLXt6CCjhup4UQz2dbDMYi4Iy/nBapZ7ViWnUCJEjwWL+98KsKusw2BxhN6A X-Bogosity: Ham, tests=bogofilter, spamicity=0.016058, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: When we read over all buffers in a folio we currently use the buffer index on the folio and blocksize to get the offset. Simplify this with bh_offset(). This simplifies the loop while making no functional changes. Suggested-by: Matthew Wilcox Signed-off-by: Luis Chamberlain --- fs/buffer.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index cc8452f60251..b99560e8a142 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -2381,7 +2381,6 @@ int block_read_full_folio(struct folio *folio, get_block_t *get_block) lblock = div_u64(limit + blocksize - 1, blocksize); bh = head; nr = 0; - i = 0; do { if (buffer_uptodate(bh)) @@ -2398,7 +2397,7 @@ int block_read_full_folio(struct folio *folio, get_block_t *get_block) page_error = true; } if (!buffer_mapped(bh)) { - folio_zero_range(folio, i * blocksize, + folio_zero_range(folio, bh_offset(bh), blocksize); if (!err) set_buffer_uptodate(bh); @@ -2412,7 +2411,7 @@ int block_read_full_folio(struct folio *folio, get_block_t *get_block) continue; } arr[nr++] = bh; - } while (i++, iblock++, (bh = bh->b_this_page) != head); + } while (iblock++, (bh = bh->b_this_page) != head); if (fully_mapped) folio_set_mappedtodisk(folio);