Commit 65a689f3 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton

page_alloc: use folio fields directly

Rmove the uses of compound_mapcount_ptr(), head_compound_mapcount() and
subpages_mapcount_ptr()

Link: https://lkml.kernel.org/r/20230111142915.1001531-10-willy@infradead.orgSigned-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 4d510f3d
...@@ -779,8 +779,8 @@ static void prep_compound_head(struct page *page, unsigned int order) ...@@ -779,8 +779,8 @@ static void prep_compound_head(struct page *page, unsigned int order)
set_compound_page_dtor(page, COMPOUND_PAGE_DTOR); set_compound_page_dtor(page, COMPOUND_PAGE_DTOR);
set_compound_order(page, order); set_compound_order(page, order);
atomic_set(compound_mapcount_ptr(page), -1); atomic_set(&folio->_entire_mapcount, -1);
atomic_set(subpages_mapcount_ptr(page), 0); atomic_set(&folio->_nr_pages_mapped, 0);
atomic_set(&folio->_pincount, 0); atomic_set(&folio->_pincount, 0);
} }
...@@ -1309,12 +1309,12 @@ static int free_tail_pages_check(struct page *head_page, struct page *page) ...@@ -1309,12 +1309,12 @@ static int free_tail_pages_check(struct page *head_page, struct page *page)
switch (page - head_page) { switch (page - head_page) {
case 1: case 1:
/* the first tail page: these may be in place of ->mapping */ /* the first tail page: these may be in place of ->mapping */
if (unlikely(head_compound_mapcount(head_page))) { if (unlikely(folio_entire_mapcount(folio))) {
bad_page(page, "nonzero compound_mapcount"); bad_page(page, "nonzero entire_mapcount");
goto out; goto out;
} }
if (unlikely(atomic_read(subpages_mapcount_ptr(head_page)))) { if (unlikely(atomic_read(&folio->_nr_pages_mapped))) {
bad_page(page, "nonzero subpages_mapcount"); bad_page(page, "nonzero nr_pages_mapped");
goto out; goto out;
} }
if (unlikely(atomic_read(&folio->_pincount))) { if (unlikely(atomic_read(&folio->_pincount))) {
......
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