The patch titled Subject: ocfs2: convert ocfs2_readpage_inline() to take a folio has been added to the -mm mm-nonmm-unstable branch. Its filename is ocfs2-convert-ocfs2_readpage_inline-to-take-a-folio.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/ocfs2-convert-ocfs2_readpage_inline-to-take-a-folio.patch This patch will later appear in the mm-nonmm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Mark Tinguely <mark.tinguely@xxxxxxxxxx> Subject: ocfs2: convert ocfs2_readpage_inline() to take a folio Date: Thu, 5 Dec 2024 17:16:35 +0000 Save a couple of calls to compound_head() by using a folio throughout this function. Link: https://lkml.kernel.org/r/20241205171653.3179945-8-willy@xxxxxxxxxxxxx Signed-off-by: Mark Tinguely <mark.tinguely@xxxxxxxxxx> Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx> Reviewed-by: Joseph Qi <joseph.qi@xxxxxxxxxxxxxxxxx> Cc: Changwei Ge <gechangwei@xxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Cc: Jun Piao <piaojun@xxxxxxxxxx> Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx> Cc: Mark Fasheh <mark@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ocfs2/aops.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- a/fs/ocfs2/aops.c~ocfs2-convert-ocfs2_readpage_inline-to-take-a-folio +++ a/fs/ocfs2/aops.c @@ -252,12 +252,12 @@ int ocfs2_read_inline_data(struct inode return 0; } -static int ocfs2_readpage_inline(struct inode *inode, struct page *page) +static int ocfs2_readpage_inline(struct inode *inode, struct folio *folio) { int ret; struct buffer_head *di_bh = NULL; - BUG_ON(!PageLocked(page)); + BUG_ON(!folio_test_locked(folio)); BUG_ON(!(OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL)); ret = ocfs2_read_inode_block(inode, &di_bh); @@ -266,9 +266,9 @@ static int ocfs2_readpage_inline(struct goto out; } - ret = ocfs2_read_inline_data(inode, page, di_bh); + ret = ocfs2_read_inline_data(inode, &folio->page, di_bh); out: - unlock_page(page); + folio_unlock(folio); brelse(di_bh); return ret; @@ -322,7 +322,7 @@ static int ocfs2_read_folio(struct file } if (oi->ip_dyn_features & OCFS2_INLINE_DATA_FL) - ret = ocfs2_readpage_inline(inode, &folio->page); + ret = ocfs2_readpage_inline(inode, folio); else ret = block_read_full_folio(folio, ocfs2_get_block); unlock = 0; _ Patches currently in -mm which might be from mark.tinguely@xxxxxxxxxx are ocfs2-convert-w_target_page-to-w_target_folio.patch ocfs2-use-a-folio-in-ocfs2_zero_new_buffers.patch ocfs2-use-a-folio-in-ocfs2_write_begin_inline.patch ocfs2-convert-ocfs2_readpage_inline-to-take-a-folio.patch ocfs2-convert-ocfs2_inode_lock_with_page-to-ocfs2_inode_lock_with_folio.patch ocfs2-convert-w_pages-to-w_folios.patch ocfs2-convert-ocfs2_write_failure-to-use-a-folio.patch ocfs2-use-a-folio-in-ocfs2_write_end_nolock.patch ocfs2-use-a-folio-in-ocfs2_prepare_page_for_write.patch ocfs2-use-a-folio-in-ocfs2_map_and_dirty_page.patch ocfs2-convert-ocfs2_map_page_blocks-to-ocfs2_map_folio_blocks.patch ocfs2-convert-ocfs2_clear_page_regions-to-ocfs2_clear_folio_regions.patch ocfs2-use-an-array-of-folios-instead-of-an-array-of-pages.patch ocfs2-convert-ocfs2_duplicate_clusters_by_page-to-use-a-folio.patch ocfs2-convert-ocfs2_map_and_dirty_page-to-ocfs2_map_and_dirty_folio.patch ocfs2-support-large-folios-in-ocfs2_zero_cluster_folios.patch ocfs2-support-large-folios-in-ocfs2_write_zero_page.patch