Merge branch 'mm-hotfixes-stable' into mm-stable to pick up changes which

are required for a merge of the series "mm: folio_pte_batch()
improvements".

1 files changed, 6 insertions, 3 deletions

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index da9f10710c27..c03896375749 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2335,12 +2335,15 @@ struct folio *alloc_hugetlb_folio_reserve(struct hstate *h, int preferred_nid,
 	struct folio *folio;
 
 	spin_lock_irq(&hugetlb_lock);
+	if (!h->resv_huge_pages) {
+		spin_unlock_irq(&hugetlb_lock);
+		return NULL;
+	}
+
 	folio = dequeue_hugetlb_folio_nodemask(h, gfp_mask, preferred_nid,
 					       nmask);
-	if (folio) {
-		VM_BUG_ON(!h->resv_huge_pages);
+	if (folio)
 		h->resv_huge_pages--;
-	}
 
 	spin_unlock_irq(&hugetlb_lock);
 	return folio;