[folded-merged] userfaultfd-introduce-mfill_get_pmd-helper-fix.patch removed from -mm tree

[folded-merged] userfaultfd-introduce-mfill_get_pmd-helper-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: userfaultfd-introduce-mfill_get_pmd-helper-fix
has been removed from the -mm tree.  Its filename was
     userfaultfd-introduce-mfill_get_pmd-helper-fix.patch

This patch was dropped because it was folded into userfaultfd-introduce-mfill_get_pmd-helper.patch

------------------------------------------------------
From: Mike Rapoport <rppt@kernel.org>
Subject: userfaultfd-introduce-mfill_get_pmd-helper-fix
Date: Wed, 25 Mar 2026 21:27:12 +0200

s/mfill_get_pmd/mfill_establish_pmd/, update ex-THP test

Link: https://lkml.kernel.org/r/acQ3EPSwizyClHKc@kernel.org
Signed-off-by: Mike Rapoport <rppt@kernel.org>
Cc: Andrei Vagin <avagin@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/userfaultfd.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- a/mm/userfaultfd.c~userfaultfd-introduce-mfill_get_pmd-helper-fix
+++ a/mm/userfaultfd.c
@@ -178,11 +178,10 @@ static pmd_t *mm_alloc_pmd(struct mm_str
 	return pmd_alloc(mm, pud, address);
 }
 
-static int mfill_get_pmd(struct mfill_state *state)
+static int mfill_establish_pmd(struct mfill_state *state)
 {
 	struct mm_struct *dst_mm = state->ctx->mm;
-	pmd_t *dst_pmd;
-	pmd_t dst_pmdval;
+	pmd_t *dst_pmd, dst_pmdval;
 
 	dst_pmd = mm_alloc_pmd(dst_mm, state->dst_addr);
 	if (unlikely(!dst_pmd))
@@ -199,7 +198,7 @@ static int mfill_get_pmd(struct mfill_st
 	 * (This includes the case where the PMD used to be THP and
 	 * changed back to none after __pte_alloc().)
 	 */
-	if (unlikely(!pmd_present(dst_pmdval) || pmd_trans_huge(dst_pmdval)))
+	if (unlikely(!pmd_present(dst_pmdval) || pmd_leaf(dst_pmdval)))
 		return -EEXIST;
 	if (unlikely(pmd_bad(dst_pmdval)))
 		return -EFAULT;
@@ -838,7 +837,7 @@ retry:
 	while (state.src_addr < src_start + len) {
 		VM_WARN_ON_ONCE(state.dst_addr >= dst_start + len);
 
-		err = mfill_get_pmd(&state);
+		err = mfill_establish_pmd(&state);
 		if (err)
 			break;
 
_

Patches currently in -mm which might be from rppt@kernel.org are

userfaultfd-introduce-mfill_copy_folio_locked-helper.patch
userfaultfd-introduce-struct-mfill_state.patch
userfaultfd-introduce-mfill_get_pmd-helper.patch
userfaultfd-introduce-mfill_get_vma-and-mfill_put_vma.patch
userfaultfd-retry-copying-with-locks-dropped-in-mfill_atomic_pte_copy.patch
userfaultfd-move-vma_can_userfault-out-of-line.patch
userfaultfd-introduce-vm_uffd_ops.patch
userfaultfd-introduce-vm_uffd_ops-fix.patch
shmem-userfaultfd-use-a-vma-callback-to-handle-uffdio_continue.patch
userfaultfd-introduce-vm_uffd_ops-alloc_folio.patch
shmem-userfaultfd-implement-shmem-uffd-operations-using-vm_uffd_ops.patch
userfaultfd-mfill_atomic-remove-retry-logic.patch
selftests-mm-pagemap_ioctl-remove-hungarian-notation.patch