Commit 2d678c64 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton

hugetlb: remove uses of compound_dtor and compound_nr

Convert the entire file to use the folio equivalents.

Link: https://lkml.kernel.org/r/20230111142915.1001531-22-willy@infradead.orgSigned-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent a60d5942
...@@ -2038,11 +2038,12 @@ static bool prep_compound_gigantic_folio_for_demote(struct folio *folio, ...@@ -2038,11 +2038,12 @@ static bool prep_compound_gigantic_folio_for_demote(struct folio *folio,
*/ */
int PageHuge(struct page *page) int PageHuge(struct page *page)
{ {
struct folio *folio;
if (!PageCompound(page)) if (!PageCompound(page))
return 0; return 0;
folio = page_folio(page);
page = compound_head(page); return folio->_folio_dtor == HUGETLB_PAGE_DTOR;
return page[1].compound_dtor == HUGETLB_PAGE_DTOR;
} }
EXPORT_SYMBOL_GPL(PageHuge); EXPORT_SYMBOL_GPL(PageHuge);
...@@ -2052,10 +2053,11 @@ EXPORT_SYMBOL_GPL(PageHuge); ...@@ -2052,10 +2053,11 @@ EXPORT_SYMBOL_GPL(PageHuge);
*/ */
int PageHeadHuge(struct page *page_head) int PageHeadHuge(struct page *page_head)
{ {
if (!PageHead(page_head)) struct folio *folio = (struct folio *)page_head;
if (!folio_test_large(folio))
return 0; return 0;
return page_head[1].compound_dtor == HUGETLB_PAGE_DTOR; return folio->_folio_dtor == HUGETLB_PAGE_DTOR;
} }
EXPORT_SYMBOL_GPL(PageHeadHuge); EXPORT_SYMBOL_GPL(PageHeadHuge);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment