The patch titled Subject: ocfs2: use a folio in ocfs2_write_begin_inline() has been added to the -mm mm-nonmm-unstable branch. Its filename is ocfs2-use-a-folio-in-ocfs2_write_begin_inline.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/ocfs2-use-a-folio-in-ocfs2_write_begin_inline.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: use a folio in ocfs2_write_begin_inline() Date: Thu, 5 Dec 2024 17:16:33 +0000 Retrieve a folio from the page cache instead of a page and use that folio throught the function. Saves a couple of calls to compound_head(). Link: https://lkml.kernel.org/r/20241205171653.3179945-6-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 | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) --- a/fs/ocfs2/aops.c~ocfs2-use-a-folio-in-ocfs2_write_begin_inline +++ a/fs/ocfs2/aops.c @@ -1473,7 +1473,7 @@ static int ocfs2_write_begin_inline(stru { int ret; struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); - struct page *page; + struct folio *folio; handle_t *handle; struct ocfs2_dinode *di = (struct ocfs2_dinode *)wc->w_di_bh->b_data; @@ -1484,19 +1484,20 @@ static int ocfs2_write_begin_inline(stru goto out; } - page = find_or_create_page(mapping, 0, GFP_NOFS); - if (!page) { + folio = __filemap_get_folio(mapping, 0, + FGP_LOCK | FGP_ACCESSED | FGP_CREAT, GFP_NOFS); + if (IS_ERR(folio)) { ocfs2_commit_trans(osb, handle); - ret = -ENOMEM; + ret = PTR_ERR(folio); mlog_errno(ret); goto out; } /* - * If we don't set w_num_pages then this page won't get unlocked + * If we don't set w_num_pages then this folio won't get unlocked * and freed on cleanup of the write context. */ - wc->w_target_folio = page_folio(page); - wc->w_pages[0] = page; + wc->w_target_folio = folio; + wc->w_pages[0] = &folio->page; wc->w_num_pages = 1; ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), wc->w_di_bh, @@ -1511,8 +1512,8 @@ static int ocfs2_write_begin_inline(stru if (!(OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL)) ocfs2_set_inode_data_inline(inode, di); - if (!PageUptodate(page)) { - ret = ocfs2_read_inline_data(inode, page, wc->w_di_bh); + if (!folio_test_uptodate(folio)) { + ret = ocfs2_read_inline_data(inode, &folio->page, wc->w_di_bh); if (ret) { ocfs2_commit_trans(osb, handle); _ 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