diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index a650f39f8ce7..661999ab147e 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -1108,10 +1108,10 @@ static int hugetlbfs_migrate_folio(struct address_space *mapping,
 	if (rc != MIGRATEPAGE_SUCCESS)
 		return rc;
 
-	if (hugetlb_folio_subpool(src)) {
-		hugetlb_set_folio_subpool(dst,
-					hugetlb_folio_subpool(src));
-		hugetlb_set_folio_subpool(src, NULL);
+	if (hugetlb_page_subpool(&src->page)) {
+		hugetlb_set_page_subpool(&dst->page,
+					hugetlb_page_subpool(&src->page));
+		hugetlb_set_page_subpool(&src->page, NULL);
 	}
 
 	if (mode != MIGRATE_SYNC_NO_COPY)
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 02d9a8af3704..0c5326fd3c47 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -754,29 +754,18 @@ extern unsigned int default_hstate_idx;
 
 #define default_hstate (hstates[default_hstate_idx])
 
-static inline struct hugepage_subpool *hugetlb_folio_subpool(struct folio *folio)
-{
-	return (void *)folio_get_private_1(folio);
-}
-
 /*
  * hugetlb page subpool pointer located in hpage[1].private
  */
 static inline struct hugepage_subpool *hugetlb_page_subpool(struct page *hpage)
 {
-	return hugetlb_folio_subpool(page_folio(hpage));
-}
-
-static inline void hugetlb_set_folio_subpool(struct folio *folio,
-					struct hugepage_subpool *subpool)
-{
-	folio_set_private_1(folio, (unsigned long)subpool);
+	return (void *)page_private(hpage + SUBPAGE_INDEX_SUBPOOL);
 }
 
 static inline void hugetlb_set_page_subpool(struct page *hpage,
 					struct hugepage_subpool *subpool)
 {
-	hugetlb_set_folio_subpool(page_folio(hpage), subpool);
+	set_page_private(hpage + SUBPAGE_INDEX_SUBPOOL, (unsigned long)subpool);
 }
 
 static inline struct hstate *hstate_file(struct file *f)