mm/hugetlb: rename dissolve_free_huge_pages() to dissolve_free_hugetlb_folios()

dissolve_free_huge_pages() only uses folios internally, rename it to
dissolve_free_hugetlb_folios() and change the comments which reference it.

[akpm@linux-foundation.org: remove unneeded `extern']
Link: https://lkml.kernel.org/r/20240412182139.120871-2-sidhartha.kumar@oracle.com
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Reviewed-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
Cc: Jane Chu <jane.chu@oracle.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Oscar Salvador <osalvador@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 8968e8a3a205dc3ac77a8f20ff43e0960a30a2dc..1bc93e7e315bb4a3ffcbe37a421d8fa8d2b092e3 100644 (file)
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -862,7 +862,7 @@ static inline int hstate_index(struct hstate *h)
 }
 
 int dissolve_free_hugetlb_folio(struct folio *folio);
-extern int dissolve_free_huge_pages(unsigned long start_pfn,
+int dissolve_free_hugetlb_folios(unsigned long start_pfn,
                                    unsigned long end_pfn);
 
 #ifdef CONFIG_MEMORY_FAILURE
@@ -1153,7 +1153,7 @@ static inline int dissolve_free_hugetlb_folio(struct folio *folio)
        return 0;
 }
 
-static inline int dissolve_free_huge_pages(unsigned long start_pfn,
+static inline int dissolve_free_hugetlb_folios(unsigned long start_pfn,
                                           unsigned long end_pfn)
 {
        return 0;

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 40bcaf2bad5596b236ee8a6d0003407d448866d2..3b7d5ddc32ad7afcb06755e7268269d8f0de71ea 100644 (file)
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2472,7 +2472,7 @@ out:
  * Also note that if dissolve_free_hugetlb_folio() returns with an error, all
  * free hugetlb folios that were dissolved before that error are lost.
  */
-int dissolve_free_huge_pages(unsigned long start_pfn, unsigned long end_pfn)
+int dissolve_free_hugetlb_folios(unsigned long start_pfn, unsigned long end_pfn)
 {
        unsigned long pfn;
        struct folio *folio;

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index b79ba36e09e03496df38b7f939c583a3e661ce44..431b1f6753c0b9e1a612ecc68b3d0c9b278593f0 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -2051,11 +2051,11 @@ int __ref offline_pages(unsigned long start_pfn, unsigned long nr_pages,
                }
 
                /*
-                * Dissolve free hugepages in the memory block before doing
+                * Dissolve free hugetlb folios in the memory block before doing
                 * offlining actually in order to make hugetlbfs's object
                 * counting consistent.
                 */
-               ret = dissolve_free_huge_pages(start_pfn, end_pfn);
+               ret = dissolve_free_hugetlb_folios(start_pfn, end_pfn);
                if (ret) {
                        reason = "failure to dissolve huge pages";
                        goto failed_removal_isolated;