mm: use pfn_swap_entry_folio() in __split_huge_pmd_locked()
authorKefeng Wang <wangkefeng.wang@huawei.com>
Thu, 11 Jan 2024 15:24:24 +0000 (15:24 +0000)
committerAndrew Morton <akpm@linux-foundation.org>
Thu, 22 Feb 2024 00:00:03 +0000 (16:00 -0800)
Call pfn_swap_entry_folio() in __split_huge_pmd_locked() as preparation
for converting mm counter functions to take a folio.

Link: https://lkml.kernel.org/r/20240111152429.3374566-6-willy@infradead.org
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/huge_memory.c

index 5468b2f97cbf70c7bf581d51a606a1fcdc32f82c..33b720037ab725369eaa6e9198cb7c18fae10fd8 100644 (file)
@@ -2442,7 +2442,7 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd,
                        swp_entry_t entry;
 
                        entry = pmd_to_swp_entry(old_pmd);
-                       page = pfn_swap_entry_to_page(entry);
+                       folio = pfn_swap_entry_folio(entry);
                } else {
                        page = pmd_page(old_pmd);
                        folio = page_folio(page);
@@ -2453,7 +2453,7 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd,
                        folio_remove_rmap_pmd(folio, page, vma);
                        folio_put(folio);
                }
-               add_mm_counter(mm, mm_counter_file(page), -HPAGE_PMD_NR);
+               add_mm_counter(mm, mm_counter_file(&folio->page), -HPAGE_PMD_NR);
                return;
        }