mm/hugetlb: drop node_alloc_noretry from alloc_fresh_hugetlb_folio
authorOscar Salvador <osalvador@suse.de>
Thu, 16 May 2024 08:10:35 +0000 (10:10 +0200)
committerAndrew Morton <akpm@linux-foundation.org>
Thu, 4 Jul 2024 02:29:52 +0000 (19:29 -0700)
Since commit d67e32f26713 ("hugetlb: restructure pool allocations"), the
parameter node_alloc_noretry from alloc_fresh_hugetlb_folio() is not used,
so drop it.

Link: https://lkml.kernel.org/r/20240516081035.5651-1-osalvador@suse.de
Signed-off-by: Oscar Salvador <osalvador@suse.de>
Reviewed-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Reviewed-by: Muchun Song <muchun.song@linux.dev>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Peter Xu <peterx@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/hugetlb.c

index 04f8d0ac069cc50b8d96f508e0f52982a47f2df2..3518321f659827fef668315418a0c1ec507a19c3 100644 (file)
@@ -2289,13 +2289,11 @@ static struct folio *only_alloc_fresh_hugetlb_folio(struct hstate *h,
  * pages is zero.
  */
 static struct folio *alloc_fresh_hugetlb_folio(struct hstate *h,
-               gfp_t gfp_mask, int nid, nodemask_t *nmask,
-               nodemask_t *node_alloc_noretry)
+               gfp_t gfp_mask, int nid, nodemask_t *nmask)
 {
        struct folio *folio;
 
-       folio = __alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask,
-                                               node_alloc_noretry);
+       folio = __alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask, NULL);
        if (!folio)
                return NULL;
 
@@ -2513,7 +2511,7 @@ static struct folio *alloc_surplus_hugetlb_folio(struct hstate *h,
                goto out_unlock;
        spin_unlock_irq(&hugetlb_lock);
 
-       folio = alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask, NULL);
+       folio = alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask);
        if (!folio)
                return NULL;
 
@@ -2549,7 +2547,7 @@ static struct folio *alloc_migrate_hugetlb_folio(struct hstate *h, gfp_t gfp_mas
        if (hstate_is_gigantic(h))
                return NULL;
 
-       folio = alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask, NULL);
+       folio = alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask);
        if (!folio)
                return NULL;
 
@@ -3474,7 +3472,7 @@ static void __init hugetlb_hstate_alloc_pages_onenode(struct hstate *h, int nid)
                        gfp_t gfp_mask = htlb_alloc_mask(h) | __GFP_THISNODE;
 
                        folio = alloc_fresh_hugetlb_folio(h, gfp_mask, nid,
-                                       &node_states[N_MEMORY], NULL);
+                                       &node_states[N_MEMORY]);
                        if (!folio)
                                break;
                        free_huge_folio(folio); /* free it into the hugepage allocator */