From patchwork Fri Feb 21 22:38:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 13986410 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 6C8C0C021B5 for ; Fri, 21 Feb 2025 22:38:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 27547280016; Fri, 21 Feb 2025 17:38:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DF48C280015; Fri, 21 Feb 2025 17:38:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 69A9F280017; Fri, 21 Feb 2025 17:38:34 -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 C0DD428001B for ; Fri, 21 Feb 2025 17:38:33 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 70ED81A0907 for ; Fri, 21 Feb 2025 22:38:33 +0000 (UTC) X-FDA: 83145417306.14.949A524 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf26.hostedemail.com (Postfix) with ESMTP id 40A43140005 for ; Fri, 21 Feb 2025 22:38:31 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=QjrfoaCI; spf=none (imf26.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=1740177511; 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=9SL9dFZnxTYWHIK0ELgxGzaHF/BgeRzk+6m5RMpyXOQ=; b=4haYdJo3oX6mFK7IWeJnsBuZfmUN6lVAJzl15FeE06px4NfjowtXwtJ7bxBFn68bULloQ3 ZBHQvTSVv9IY8qSlDzdHfpaj1UqNqJV3DVs/XK4Rqyv2B2Xcw5nC1CzZfkWPNmuPvN8KWG y/pa793Oi2UPpe/MdwaBpyBznG7XyAQ= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=QjrfoaCI; spf=none (imf26.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=1740177511; a=rsa-sha256; cv=none; b=5mzm6j5Anfa+vgrOmlLEFlmDi6x3jaO+Ou0yl1QS24eDjsCUhg69GOQeL3YIUqTQSj0NQU qfDUGVFJpKlYSY3kXKfs9UyBAW/dfZpkkR0koV6RXzdanbOj4PdxdpnAXqrai1g0cBvKFA /4FAODStufAVnLt9IjrOIjGihLiR8Wo= 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=9SL9dFZnxTYWHIK0ELgxGzaHF/BgeRzk+6m5RMpyXOQ=; b=QjrfoaCIfvDWXPGcUb8l9WbJQ1 ILfiLiecFwoGMbekJ5E0Q7wwhRpMhxjYb5SKNf2xsEiUlNCS7n9rJ4tOlO07A3uRPG7Vz7geVOVdD sWwDNoOweGQt0ze4/euWidilzry8UydBfqH5T2mvoRkCIz2VF9w5HUbvQoZ3ZB9/Uj40SlikgLFbX lkc8xCuyU6zLVLVjuArqQ+JpTriOEsDSpL4SWQLMX/p9ONXK0qYirstmus9XW5ZKfDl2PvGkdB7m4 l1I+Wzs0gY4t8f0ujfCjIcGUz7s0mBQAN+5zV5BAgWH81wGS7jKZzjClWHNEJ2UWran++CHIpmSfC ZlW1ekFw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tlbf7-000000073D0-36QQ; Fri, 21 Feb 2025 22:38:25 +0000 From: Luis Chamberlain To: brauner@kernel.org, akpm@linux-foundation.org, 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 v3 1/8] fs/buffer: simplify block_read_full_folio() with bh_offset() Date: Fri, 21 Feb 2025 14:38:16 -0800 Message-ID: <20250221223823.1680616-2-mcgrof@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250221223823.1680616-1-mcgrof@kernel.org> References: <20250221223823.1680616-1-mcgrof@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 40A43140005 X-Stat-Signature: rba6sn4a51kk58qsjwfjsq64chsiiux7 X-Rspamd-Pre-Result: action=add header; module=dmarc; Action set by DMARC X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspam: Yes X-HE-Tag: 1740177511-525341 X-HE-Meta: U2FsdGVkX1+0bL2lp04jJgpwhXGrCj0jQTGcqik4xaa2+RyStn0vUB3TfkBWiBU1a+zGb47JCFTNCucN4ts66e/1l1Z1vkzyEuG3SwxuLyELBIF+1wjgGQRkL7/qbCDzENlYjxfTzyvD+YfsYtf62bMikigfqW7h4ryhOc5qKavLrIUx40UkCa9XqDyT4Lno2Gl3lRR80OoQ87nK3FW7K2DeEBomYf2xloECRdUnia6k4QR1uRofV4a4B1Kw3K6gHcH2Sqpz8TCBz6hivDz8+d5m8NA0F/m5Vin7zwLAli88x9Zbivpb1X4O+i4x/KGfsPndJ+UVaJdAWaIqcUreWdWurj9I2D3uKyUJUQz0kWejnsL8NwdOhcI+karFFkgs22Wo6InKDpkOHMHXn0Fc1+RI4Wi4bdcSjf6gBBIennQYCBAqNvlzgzCwTZE2Xq2ordwyrh1z5XJ2COH7uejxFT1d0aBbQ8ROUfX/bHuKOgColjNZ2wgFEmh5gm6GkZJxny7KS1YYZQSws4JILEfhGJ5OnjtJ4E67uNmw4FHvVnVIzWGjaiHkzm9AIMxazlX/a279HUhtMCshC1iyG7Sq88MMaqVxqAXNRVGbpbPdxna2JNRYCSNuWUaTi/xfuIX7uSVvijNJ/Sz2ippg0nhGh5qmAdWKNPPtMoWaNC6opVlnl8GZknizt4938X9Ia7IXNhTwoSAYfFNTfaZHicojZzzdq1a8EckDce3JO9zCSK0v+CW4liAGned9xN6u6L+oub67DWLGuimDqp84Q1nxZnSxsV1xXmEbkePSLpvtqpTjcvtTwl7RTIc+XhZ5wMavgygQjtuzHbN+cGpg4LWfmKlgmF/1lbTtVKqGT+926ZyT8m0bdUFzwGeXASH6fL6M2aAmtfi3VEoq1leQfnOUPb8EskkSz2YoExxGHfW8XpVee5IIMYkfpkdl5qVtF4VoQE8jP6l95bnTJXnSo3j SmCdcWHv hxoytQZN1k87JCmxKEL3SI3H3aQ7Ow0uNYP1196AkhR2QSkaE6QzptRA1qGUNT2doJ+rX8Se1CnNVcbREyA4NrE3/oPej88MpTCBoc7RWwtrKvYVbrrcEa5YXp7xaydN7k3IoTO5ym/xkzK7ggBks0io0Fr2NjPYvETbaGQDpMsFZ8naMYbjJrX8l/1EA0IDyS+1gxGz2PSr9dOOabgnZdQya3YW95oify+ZtKPrPWiAKjOWutFA20WOx5aHwFFwcIK540AwsARr9zRIspWhH7QBzJyc1P71/GvmoBqaz1ENsIJK4Y1C7dusnMgGuJfZ7KTbUwO/GJZx5NnXK/NDlOq1xAk/j1hF+iRxfsZXuLTBIj5S0trJwdmDAzGu0hSPtNmaeTWWPIwPuiLaTvoC11SGX70Bj81e7JcE9Ba55rEFVJSv9mlI6Djx8Dp2sjn7dJ2DU3o3+H+1ZrWU9ywBiXKaRSzyVQw3BUxbNQQUYtnOIImNipRAQTgasMkZx9aYgnVagoETwqP1S/M5O3w7moyrmbX+eeVOelTc7rhTpqTsy+j+rGpCefSlf2wfzAC4IJQd7hxVZ0EPDFlmtW2xUtrUtfo+rx8X+6d97 X-Bogosity: Ham, tests=bogofilter, spamicity=0.002126, 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 Reviewed-by: Hannes Reinecke 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);