mm/gup: Convert gup_hugepte() to use a folio

There should be little to no effect from this patch; just removing
uses of some old APIs.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: John Hubbard <jhubbard@nvidia.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: William Kucharski <william.kucharski@oracle.com>

diff --git a/mm/gup.c b/mm/gup.c
index 94e0e2a130fc2bf24ef996b163142edeadbde12f..bd5b49a1bc13fd1701c114e6f9500ac97d3bb1f1 100644 (file)
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -2425,7 +2425,8 @@ static int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr,
                       struct page **pages, int *nr)
 {
        unsigned long pte_end;
-       struct page *head, *page;
+       struct page *page;
+       struct folio *folio;
        pte_t pte;
        int refs;
 
@@ -2441,21 +2442,20 @@ static int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr,
        /* hugepages are never "special" */
        VM_BUG_ON(!pfn_valid(pte_pfn(pte)));
 
-       head = pte_page(pte);
-       page = nth_page(head, (addr & (sz - 1)) >> PAGE_SHIFT);
+       page = nth_page(pte_page(pte), (addr & (sz - 1)) >> PAGE_SHIFT);
        refs = record_subpages(page, addr, end, pages + *nr);
 
-       head = try_grab_compound_head(head, refs, flags);
-       if (!head)
+       folio = try_grab_folio(page, refs, flags);
+       if (!folio)
                return 0;
 
        if (unlikely(pte_val(pte) != pte_val(*ptep))) {
-               put_compound_head(head, refs, flags);
+               gup_put_folio(folio, refs, flags);
                return 0;
        }
 
        *nr += refs;
-       SetPageReferenced(head);
+       folio_set_referenced(folio);
        return 1;
 }