diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2021-12-22 16:38:30 -0500 |
|---|---|---|
| committer | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-03-21 12:56:35 -0400 |
| commit | 09a1626effb89dddcde10c10f5e3c5e6f8b94136 (patch) | |
| tree | e71ef386edf3085295e2a02ec1fc9d3d3104271b /mm | |
| parent | b0496fe4effd83ef76c7440befb184f922b3ffbb (diff) | |
| download | linux-09a1626effb89dddcde10c10f5e3c5e6f8b94136.tar.gz | |
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>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/gup.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mm/gup.c b/mm/gup.c index 94e0e2a130fc..bd5b49a1bc13 100644 --- 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; } |