diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c
index 1f8e977e830e..9149a95282e0 100644
--- a/mm/userfaultfd.c
+++ b/mm/userfaultfd.c
@@ -852,9 +852,6 @@ static int move_present_pte(struct mm_struct *mm,
 		goto out;
 	}
 
-	page_move_anon_rmap(&src_folio->page, dst_vma);
-	WRITE_ONCE(src_folio->index, linear_page_index(dst_vma, dst_addr));
-
 	orig_src_pte = ptep_clear_flush(src_vma, src_addr, src_pte);
 	/* Folio got pinned from under us. Put it back and fail the move. */
 	if (folio_maybe_dma_pinned(src_folio)) {
@@ -863,6 +860,9 @@ static int move_present_pte(struct mm_struct *mm,
 		goto out;
 	}
 
+	page_move_anon_rmap(&src_folio->page, dst_vma);
+	WRITE_ONCE(src_folio->index, linear_page_index(dst_vma, dst_addr));
+
 	orig_dst_pte = mk_pte(&src_folio->page, dst_vma->vm_page_prot);
 	/* Follow mremap() behavior and treat the entry dirty after the move */
 	orig_dst_pte = pte_mkwrite(pte_mkdirty(orig_dst_pte));