diff mbox series

[28/31] ext4: Use a folio iterator in __read_end_io()

Message ID	20230126202415.1682629-29-willy@infradead.org
State	Changes Requested
Headers	show Return-Path: <SRS0=vk6L=5X=vger.kernel.org=linux-ext4-owner@ozlabs.org> From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: "Theodore Tso" <tytso@mit.edu>, Andreas Dilger <adilger.kernel@dilger.ca> Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 28/31] ext4: Use a folio iterator in __read_end_io() Date: Thu, 26 Jan 2023 20:24:12 +0000 Message-Id: <20230126202415.1682629-29-willy@infradead.org> In-Reply-To: <20230126202415.1682629-1-willy@infradead.org> References: <20230126202415.1682629-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Convert most of ext4 to folios \| expand [00/31] Convert most of ext4 to folios [01/31] fs: Add FGP_WRITEBEGIN [02/31] fscrypt: Add some folio helper functions [03/31] ext4: Convert ext4_bio_write_page() to use a folio [04/31] ext4: Convert ext4_finish_bio() to use folios [05/31] ext4: Convert ext4_writepage() to use a folio [06/31] ext4: Turn mpage_process_page() into mpage_process_folio() [07/31] ext4: Convert mpage_submit_page() to mpage_submit_folio() [08/31] ext4: Convert ext4_bio_write_page() to ext4_bio_write_folio() [09/31] ext4: Convert ext4_readpage_inline() to take a folio [10/31] ext4: Convert ext4_convert_inline_data_to_extent() to use a folio [11/31] ext4: Convert ext4_try_to_write_inline_data() to use a folio [12/31] ext4: Convert ext4_da_convert_inline_data_to_extent() to use a folio [13/31] ext4: Convert ext4_da_write_inline_data_begin() to use a folio [14/31] ext4: Convert ext4_read_inline_page() to ext4_read_inline_folio() [15/31] ext4: Convert ext4_write_inline_data_end() to use a folio [16/31] ext4: Convert ext4_write_begin() to use a folio [17/31] ext4: Convert ext4_write_end() to use a folio [18/31] ext4: Use a folio in ext4_journalled_write_end() [19/31] ext4: Convert ext4_journalled_zero_new_buffers() to use a folio [20/31] ext4: Convert __ext4_block_zero_page_range() to use a folio [21/31] ext4: Convert __ext4_journalled_writepage() to take a folio [22/31] ext4: Convert ext4_page_nomap_can_writeout() to take a folio [23/31] ext4: Use a folio in ext4_da_write_begin() [24/31] ext4: Convert ext4_mpage_readpages() to work on folios [25/31] ext4: Convert ext4_block_write_begin() to take a folio [26/31] ext4: Convert ext4_writepage() to take a folio [27/31] ext4: Use a folio in ext4_page_mkwrite() [28/31] ext4: Use a folio iterator in __read_end_io() [29/31] ext4: Convert mext_page_mkuptodate() to take a folio [30/31] ext4: Convert pagecache_read() to use a folio [31/31] ext4: Use a folio in ext4_read_merkle_tree_page

Commit Message

Matthew Wilcox Jan. 26, 2023, 8:24 p.m. UTC

Iterate once per folio, not once per page.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 fs/ext4/readpage.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff mbox series

Patch

diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c
index 8092d2ace75e..442f6c507016 100644
--- a/fs/ext4/readpage.c
+++ b/fs/ext4/readpage.c
@@ -68,18 +68,16 @@  struct bio_post_read_ctx {
 
 static void __read_end_io(struct bio *bio)
 {
-	struct page *page;
-	struct bio_vec *bv;
-	struct bvec_iter_all iter_all;
+	struct folio_iter fi;
 
-	bio_for_each_segment_all(bv, bio, iter_all) {
-		page = bv->bv_page;
+	bio_for_each_folio_all(fi, bio) {
+		struct folio *folio = fi.folio;
 
 		if (bio->bi_status)
-			ClearPageUptodate(page);
+			folio_clear_uptodate(folio);
 		else
-			SetPageUptodate(page);
-		unlock_page(page);
+			folio_mark_uptodate(folio);
+		folio_unlock(folio);
 	}
 	if (bio->bi_private)
 		mempool_free(bio->bi_private, bio_post_read_ctx_pool);