[22/27] f2fs: Add f2fs_get_lock_data_folio()

Message ID	20250218055203.591403-23-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 541EC1B6D01 for <linux-fsdevel@vger.kernel.org>; Tue, 18 Feb 2025 05:52:10 +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 22/27] f2fs: Add f2fs_get_lock_data_folio() Date: Tue, 18 Feb 2025 05:51:56 +0000 Message-ID: <20250218055203.591403-23-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-23-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 22/27] f2fs: Add f2fs_get_lock_data_folio()
Date: Tue, 18 Feb 2025 05:51:56 +0000
Message-ID: <20250218055203.591403-23-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

Convert f2fs_get_lock_data_page() to f2fs_get_lock_data_folio() and
add a compatibility wrapper.  Removes three hidden calls to
compound_head().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 fs/f2fs/data.c | 18 +++++++++---------
 fs/f2fs/f2fs.h | 10 +++++++++-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index f0747c7f669d..e891c95bc525 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1310,23 +1310,23 @@  struct page *f2fs_find_data_page(struct inode *inode, pgoff_t index,
  * Because, the callers, functions in dir.c and GC, should be able to know
  * whether this page exists or not.
  */
-struct page *f2fs_get_lock_data_page(struct inode *inode, pgoff_t index,
+struct folio *f2fs_get_lock_data_folio(struct inode *inode, pgoff_t index,
 							bool for_write)
 {
 	struct address_space *mapping = inode->i_mapping;
-	struct page *page;
+	struct folio *folio;
 
-	page = f2fs_get_read_data_page(inode, index, 0, for_write, NULL);
-	if (IS_ERR(page))
-		return page;
+	folio = f2fs_get_read_data_folio(inode, index, 0, for_write, NULL);
+	if (IS_ERR(folio))
+		return folio;
 
 	/* wait for read completion */
-	lock_page(page);
-	if (unlikely(page->mapping != mapping || !PageUptodate(page))) {
-		f2fs_put_page(page, 1);
+	folio_lock(folio);
+	if (unlikely(folio->mapping != mapping || !folio_test_uptodate(folio))) {
+		f2fs_folio_put(folio, true);
 		return ERR_PTR(-EIO);
 	}
-	return page;
+	return folio;
 }
 
 /*
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 3e02df63499e..c78ba3c7d642 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3899,7 +3899,7 @@  struct folio *f2fs_get_read_data_folio(struct inode *inode, pgoff_t index,
 		blk_opf_t op_flags, bool for_write, pgoff_t *next_pgofs);
 struct page *f2fs_find_data_page(struct inode *inode, pgoff_t index,
 							pgoff_t *next_pgofs);
-struct page *f2fs_get_lock_data_page(struct inode *inode, pgoff_t index,
+struct folio *f2fs_get_lock_data_folio(struct inode *inode, pgoff_t index,
 			bool for_write);
 struct page *f2fs_get_new_data_page(struct inode *inode,
 			struct page *ipage, pgoff_t index, bool new_i_size);
@@ -3936,6 +3936,14 @@  static inline struct page *f2fs_get_read_data_page(struct inode *inode,
 	return &folio->page;
 }
 
+static inline struct page *f2fs_get_lock_data_page(struct inode *inode,
+		pgoff_t index, bool for_write)
+{
+	struct folio *folio = f2fs_get_lock_data_folio(inode, index, for_write);
+
+	return &folio->page;
+}
+
 /*
  * gc.c
  */

[22/27] f2fs: Add f2fs_get_lock_data_folio()

Commit Message

Patch