mm: remove some calls to page_add_new_anon_rmap()

We already have the folio in these functions, we just need to use it.
folio_add_new_anon_rmap() didn't exist at the time they were converted to
folios.

Link: https://lkml.kernel.org/r/20231211162214.2146080-5-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 435aac1d8c2721624e1712895eda1bc982db4e83..8b115fc43f041fe71944c177aa130a53bad3db0e 100644 (file)
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -181,7 +181,7 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr,
 
        if (new_page) {
                folio_get(new_folio);
-               page_add_new_anon_rmap(new_page, vma, addr);
+               folio_add_new_anon_rmap(new_folio, vma, addr);
                folio_add_lru_vma(new_folio, vma);
        } else
                /* no new page, just dec_mm_counter for old_page */

diff --git a/mm/memory.c b/mm/memory.c
index 7649cb9eb7f52dd6ad2dfb9a46e284c15da01808..5c023bef2adbf92e50906b0a983ec1e9b6491b95 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4071,7 +4071,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
 
        /* ksm created a completely new copy */
        if (unlikely(folio != swapcache && swapcache)) {
-               page_add_new_anon_rmap(page, vma, vmf->address);
+               folio_add_new_anon_rmap(folio, vma, vmf->address);
                folio_add_lru_vma(folio, vma);
        } else {
                page_add_anon_rmap(page, vma, vmf->address, rmap_flags);

diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c
index 9ec814e47e99c701b05545d6326fc929d211194c..203cda9192c2946a8e57e920dc88ac73f06d598c 100644 (file)
--- a/mm/userfaultfd.c
+++ b/mm/userfaultfd.c
@@ -116,7 +116,7 @@ int mfill_atomic_install_pte(pmd_t *dst_pmd,
                        folio_add_lru(folio);
                page_add_file_rmap(page, dst_vma, false);
        } else {
-               page_add_new_anon_rmap(page, dst_vma, dst_addr);
+               folio_add_new_anon_rmap(folio, dst_vma, dst_addr);
                folio_add_lru_vma(folio, dst_vma);
        }