The problem with filemap_lock_hugetlb_folio() is redundancy, replace it with the generic filemap_lock_folio(). Suggested-by: David Hildenbrand Signed-off-by: Jane Chu --- fs/hugetlbfs/inode.c | 3 +-- include/linux/hugetlb.h | 12 ------------ mm/hugetlb.c | 4 ++-- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 02cb265a580e..6c883478f7e7 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -518,10 +518,9 @@ static void hugetlbfs_zero_partial_page(struct hstate *h, loff_t start, loff_t end) { - pgoff_t idx = start >> huge_page_shift(h); struct folio *folio; - folio = filemap_lock_hugetlb_folio(h, mapping, idx); + folio = filemap_lock_folio(mapping, start); if (IS_ERR(folio)) return; diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index cae5cdd3ea00..e78d0f706681 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -824,12 +824,6 @@ static inline unsigned int blocks_per_huge_page(struct hstate *h) return huge_page_size(h) / 512; } -static inline struct folio *filemap_lock_hugetlb_folio(struct hstate *h, - struct address_space *mapping, pgoff_t idx) -{ - return filemap_lock_folio(mapping, idx << huge_page_order(h)); -} - #include #ifndef is_hugepage_only_range @@ -1096,12 +1090,6 @@ static inline struct hugepage_subpool *hugetlb_folio_subpool(struct folio *folio return NULL; } -static inline struct folio *filemap_lock_hugetlb_folio(struct hstate *h, - struct address_space *mapping, pgoff_t idx) -{ - return NULL; -} - static inline int isolate_or_dissolve_huge_folio(struct folio *folio, struct list_head *list) { diff --git a/mm/hugetlb.c b/mm/hugetlb.c index ecd1d1322fda..5484e78fe72e 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5715,7 +5715,7 @@ static vm_fault_t hugetlb_no_page(struct address_space *mapping, * before we get page_table_lock. */ new_folio = false; - folio = filemap_lock_hugetlb_folio(h, mapping, idx); + folio = filemap_lock_folio(mapping, vmf->pgoff); if (IS_ERR(folio)) { size = i_size_read(mapping->host) >> PAGE_SHIFT; if (vmf->pgoff >= size) @@ -6201,7 +6201,7 @@ int hugetlb_mfill_atomic_pte(pte_t *dst_pte, if (is_continue) { ret = -EFAULT; - folio = filemap_lock_hugetlb_folio(h, mapping, idx); + folio = filemap_lock_folio(mapping, idx << huge_page_order(h)); if (IS_ERR(folio)) goto out; folio_in_pagecache = true; -- 2.43.5