mm/gup: Convert gup_huge_pmd() to use a folio
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Wed, 22 Dec 2021 21:57:23 +0000 (16:57 -0500)
committerMatthew Wilcox (Oracle) <willy@infradead.org>
Mon, 21 Mar 2022 16:56:35 +0000 (12:56 -0400)
Use the new folio-based 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>
mm/gup.c

index bd5b49a..15de593 100644 (file)
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -2489,7 +2489,8 @@ static int gup_huge_pmd(pmd_t orig, pmd_t *pmdp, unsigned long addr,
                        unsigned long end, unsigned int flags,
                        struct page **pages, int *nr)
 {
-       struct page *head, *page;
+       struct page *page;
+       struct folio *folio;
        int refs;
 
        if (!pmd_access_permitted(orig, flags & FOLL_WRITE))
@@ -2505,17 +2506,17 @@ static int gup_huge_pmd(pmd_t orig, pmd_t *pmdp, unsigned long addr,
        page = nth_page(pmd_page(orig), (addr & ~PMD_MASK) >> PAGE_SHIFT);
        refs = record_subpages(page, addr, end, pages + *nr);
 
-       head = try_grab_compound_head(pmd_page(orig), refs, flags);
-       if (!head)
+       folio = try_grab_folio(page, refs, flags);
+       if (!folio)
                return 0;
 
        if (unlikely(pmd_val(orig) != pmd_val(*pmdp))) {
-               put_compound_head(head, refs, flags);
+               gup_put_folio(folio, refs, flags);
                return 0;
        }
 
        *nr += refs;
-       SetPageReferenced(head);
+       folio_set_referenced(folio);
        return 1;
 }