From: Matthew Wilcox (Oracle) <willy@infradead.org>
Date: Fri, 30 Dec 2022 20:22:11 +0000 (-0500)
Subject: hugetlb: Remove uses of folio_mapcount_ptr
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2e2912ca91b9235e858e15ce09d6051ac5df3598;p=users%2Fwilly%2Fpagecache.git

hugetlb: Remove uses of folio_mapcount_ptr

Use the entire_mapcount field directly.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 55e744abb9626..0a6bb471c1a74 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1478,7 +1478,7 @@ static void __destroy_compound_gigantic_folio(struct folio *folio,
 	int nr_pages = 1 << order;
 	struct page *p;
 
-	atomic_set(folio_mapcount_ptr(folio), 0);
+	atomic_set(&folio->_entire_mapcount, 0);
 	atomic_set(&folio->_nr_pages_mapped, 0);
 	atomic_set(&folio->_pincount, 0);
 
@@ -2000,7 +2000,7 @@ static bool __prep_compound_gigantic_folio(struct folio *folio,
 		if (i != 0)
 			set_compound_head(p, &folio->page);
 	}
-	atomic_set(folio_mapcount_ptr(folio), -1);
+	atomic_set(&folio->_entire_mapcount, -1);
 	atomic_set(&folio->_nr_pages_mapped, 0);
 	atomic_set(&folio->_pincount, 0);
 	return true;