The patch titled Subject: mm: use filemap_get_entry in filemap_get_incore_folio has been added to the -mm mm-unstable branch. Its filename is mm-use-filemap_get_entry-in-filemap_get_incore_folio.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-use-filemap_get_entry-in-filemap_get_incore_folio.patch This patch will later appear in the mm-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: Christoph Hellwig <hch@xxxxxx> Subject: mm: use filemap_get_entry in filemap_get_incore_folio Date: Tue, 7 Mar 2023 15:34:06 +0100 filemap_get_incore_folio wants to look at the details of xa_is_value entries, but doesn't need any of the other logic in filemap_get_folio. Switch it to use the lower-level filemap_get_entry interface. Link: https://lkml.kernel.org/r/20230307143410.28031-4-hch@xxxxxx Signed-off-by: Christoph Hellwig <hch@xxxxxx> Reviewed-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx> Cc: Andreas Gruenbacher <agruenba@xxxxxxxxxx> Cc: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/swap_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/swap_state.c~mm-use-filemap_get_entry-in-filemap_get_incore_folio +++ a/mm/swap_state.c @@ -386,7 +386,7 @@ struct folio *filemap_get_incore_folio(s { swp_entry_t swp; struct swap_info_struct *si; - struct folio *folio = __filemap_get_folio(mapping, index, FGP_ENTRY, 0); + struct folio *folio = filemap_get_entry(mapping, index); if (!xa_is_value(folio)) goto out; _ Patches currently in -mm which might be from hch@xxxxxx are ufs-dont-flush-page-immediately-for-dirsync-directories.patch ocfs2-dont-use-write_one_page-in-ocfs2_duplicate_clusters_by_page.patch mmjfs-move-write_one_page-folio_write_one-to-jfs.patch mm-dont-look-at-xarray-value-entries-in-split_huge_pages_in_file.patch mm-make-mapping_get_entry-available-outside-of-filemapc.patch mm-use-filemap_get_entry-in-filemap_get_incore_folio.patch shmem-remove-shmem_get_partial_folio.patch shmem-open-code-the-page-cache-lookup-in-shmem_get_folio_gfp.patch mm-remove-fgp_entry.patch mm-return-an-err_ptr-from-__filemap_get_folio.patch