The patch titled Subject: fix mm-add-and-use-find_lock_entries.patch has been added to the -mm tree. Its filename is mm-add-and-use-find_lock_entries-fix.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-add-and-use-find_lock_entries-fix.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-add-and-use-find_lock_entries-fix.patch 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 and is updated there every 3-4 working days ------------------------------------------------------ From: "Matthew Wilcox (Oracle)" <willy@xxxxxxxxxxxxx> Subject: fix mm-add-and-use-find_lock_entries.patch Link: https://lkml.kernel.org/r/20201124041507.28996-3-willy@xxxxxxxxxxxxx Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/filemap.c | 2 ++ 1 file changed, 2 insertions(+) --- a/mm/filemap.c~mm-add-and-use-find_lock_entries-fix +++ a/mm/filemap.c @@ -1963,6 +1963,8 @@ unsigned find_lock_entries(struct addres goto put; if (page->mapping != mapping || PageWriteback(page)) goto unlock; + VM_BUG_ON_PAGE(!thp_contains(page, xas.xa_index), + page); } indices[pvec->nr] = xas.xa_index; if (!pagevec_add(pvec, page)) _ Patches currently in -mm which might be from willy@xxxxxxxxxxxxx are mm-page-flags-fix-comment.patch mm-page_alloc-add-__free_pages-documentation.patch mm-support-thps-in-zero_user_segments.patch mm-make-pagecache-tagged-lookups-return-only-head-pages.patch mm-shmem-use-pagevec_lookup-in-shmem_unlock_mapping.patch mm-swap-optimise-get_shadow_from_swap_cache.patch mm-add-fgp_entry.patch mm-filemap-rename-find_get_entry-to-mapping_get_entry.patch mm-filemap-add-helper-for-finding-pages.patch mm-filemap-add-helper-for-finding-pages-fix.patch mm-filemap-add-mapping_seek_hole_data.patch iomap-use-mapping_seek_hole_data.patch mm-add-and-use-find_lock_entries.patch mm-add-and-use-find_lock_entries-fix.patch mm-add-an-end-parameter-to-find_get_entries.patch mm-add-an-end-parameter-to-pagevec_lookup_entries.patch mm-remove-nr_entries-parameter-from-pagevec_lookup_entries.patch mm-pass-pvec-directly-to-find_get_entries.patch mm-remove-pagevec_lookup_entries.patch mm-truncateshmem-handle-truncates-that-split-thps.patch mm-filemap-return-only-head-pages-from-find_get_entries.patch