[19/27] f2fs: Use a folio throughout __get_meta_page()

Message ID	20250218055203.591403-20-willy@infradead.org (mailing list archive)
State	New
Headers	show Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACC811B4250 for <linux-fsdevel@vger.kernel.org>; Tue, 18 Feb 2025 05:52:09 +0000 (UTC) From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: Jaegeuk Kim <jaegeuk@kernel.org>, Chao Yu <chao@kernel.org> Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org Subject: [PATCH 19/27] f2fs: Use a folio throughout __get_meta_page() Date: Tue, 18 Feb 2025 05:51:53 +0000 Message-ID: <20250218055203.591403-20-willy@infradead.org> In-Reply-To: <20250218055203.591403-1-willy@infradead.org> References: <20250218055203.591403-1-willy@infradead.org> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	f2fs folio conversions for v6.15 \| expand [00/27] f2fs folio conversions for v6.15 [01/27] f2fs: Add f2fs_folio_wait_writeback() [02/27] mm: Remove wait_for_stable_page() [03/27] f2fs: Add f2fs_folio_put() [04/27] f2fs: Convert f2fs_flush_inline_data() to use a folio [05/27] f2fs: Convert f2fs_sync_node_pages() to use a folio [06/27] f2fs: Pass a folio to flush_dirty_inode() [07/27] f2fs: Convert f2fs_fsync_node_pages() to use a folio [08/27] f2fs: Convert last_fsync_dnode() to use a folio [09/27] f2fs: Return a folio from last_fsync_dnode() [10/27] f2fs: Add f2fs_grab_cache_folio() [11/27] mm: Remove grab_cache_page_write_begin() [12/27] f2fs: Use a folio in __get_node_page() [13/27] f2fs: Use a folio in do_write_page() [14/27] f2fs: Convert f2fs_write_end_io() to use a folio_iter [15/27] f2fs: Mark some functions as taking a const page pointer [16/27] f2fs: Convert f2fs_in_warm_node_list() to take a folio [17/27] f2fs: Add f2fs_get_node_folio() [18/27] f2fs: Use a folio throughout f2fs_truncate_inode_blocks() [19/27] f2fs: Use a folio throughout __get_meta_page() [20/27] f2fs: Hoist the page_folio() call to the start of f2fs_merge_page_bio() [21/27] f2fs: Add f2fs_get_read_data_folio() [22/27] f2fs: Add f2fs_get_lock_data_folio() [23/27] f2fs: Convert move_data_page() to use a folio [24/27] f2fs: Convert truncate_partial_data_page() to use a folio [25/27] f2fs: Convert gc_data_segment() to use a folio [26/27] f2fs: Add f2fs_find_data_folio() [27/27] mm: Remove wait_on_page_locked()

Message ID

20250218055203.591403-20-willy@infradead.org (mailing list archive)

State

New

Headers

From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Jaegeuk Kim <jaegeuk@kernel.org>,
	Chao Yu <chao@kernel.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
	linux-f2fs-devel@lists.sourceforge.net,
	linux-fsdevel@vger.kernel.org
Subject: [PATCH 19/27] f2fs: Use a folio throughout __get_meta_page()
Date: Tue, 18 Feb 2025 05:51:53 +0000
Message-ID: <20250218055203.591403-20-willy@infradead.org>
In-Reply-To: <20250218055203.591403-1-willy@infradead.org>
References: <20250218055203.591403-1-willy@infradead.org>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

f2fs folio conversions for v6.15 | expand

Commit Message

Matthew Wilcox Feb. 18, 2025, 5:51 a.m. UTC

Use f2fs_grab_cache_folio() to get a folio and use it throughout,
removing seven calls to compound_head() and a reference to page->mapping.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 fs/f2fs/checkpoint.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index bd890738b94d..75b7196d2c81 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -58,7 +58,7 @@  static struct page *__get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index,
 							bool is_meta)
 {
 	struct address_space *mapping = META_MAPPING(sbi);
-	struct page *page;
+	struct folio *folio;
 	struct f2fs_io_info fio = {
 		.sbi = sbi,
 		.type = META,
@@ -74,37 +74,37 @@  static struct page *__get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index,
 	if (unlikely(!is_meta))
 		fio.op_flags &= ~REQ_META;
 repeat:
-	page = f2fs_grab_cache_page(mapping, index, false);
-	if (!page) {
+	folio = f2fs_grab_cache_folio(mapping, index, false);
+	if (IS_ERR(folio)) {
 		cond_resched();
 		goto repeat;
 	}
-	if (PageUptodate(page))
+	if (folio_test_uptodate(folio))
 		goto out;
 
-	fio.page = page;
+	fio.page = &folio->page;
 
 	err = f2fs_submit_page_bio(&fio);
 	if (err) {
-		f2fs_put_page(page, 1);
+		f2fs_folio_put(folio, true);
 		return ERR_PTR(err);
 	}
 
 	f2fs_update_iostat(sbi, NULL, FS_META_READ_IO, F2FS_BLKSIZE);
 
-	lock_page(page);
-	if (unlikely(page->mapping != mapping)) {
-		f2fs_put_page(page, 1);
+	folio_lock(folio);
+	if (unlikely(folio->mapping != mapping)) {
+		f2fs_folio_put(folio, true);
 		goto repeat;
 	}
 
-	if (unlikely(!PageUptodate(page))) {
-		f2fs_handle_page_eio(sbi, page_folio(page), META);
-		f2fs_put_page(page, 1);
+	if (unlikely(!folio_test_uptodate(folio))) {
+		f2fs_handle_page_eio(sbi, folio, META);
+		f2fs_folio_put(folio, true);
 		return ERR_PTR(-EIO);
 	}
 out:
-	return page;
+	return &folio->page;
 }
 
 struct page *f2fs_get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index)

[19/27] f2fs: Use a folio throughout __get_meta_page()

Commit Message

Patch