Skip to contentSkip to conversation

hugetlb-make-hugepage_put_subpool-tolerate-null.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Aug 7

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: hugetlb: make hugepage_put_subpool() tolerate NULL
has been removed from the -mm tree. Its filename was
hugetlb-make-hugepage_put_subpool-tolerate-null.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Yichong Chen <[email protected]>
Subject: hugetlb: make hugepage_put_subpool() tolerate NULL
Date: Mon, 20 Jul 2026 15:38:41 +0800

Both callers of hugepage_put_subpool() check whether the subpool pointer is NULL before calling it. Move the NULL check into hugepage_put_subpool() so callers can use the helper unconditionally.

This is a follow-up cleanup after using hugepage_put_subpool() from the hugetlbfs_fill_super() failure path.

---

 fs/hugetlbfs/inode.c |    6 ++----
 mm/hugetlb.c         |    3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)
fs/hugetlbfs/inode.c renamed from fs/hugetlbfs/inode.c~hugetlb-make-hugepage_put_subpool-tolerate-null +2 -4
@@ -1129,8 +1129,7 @@ static void hugetlbfs_put_super(struct s
 	if (sbi) {
 		sb->s_fs_info = NULL;
 
-		if (sbi->spool)
-			hugepage_put_subpool(sbi->spool);
+		hugepage_put_subpool(sbi->spool);
 
 		kfree(sbi);
 	}
@@ -1419,8 +1418,7 @@ hugetlbfs_fill_super(struct super_block
 		goto out_free;
 	return 0;
 out_free:
-	if (sbinfo->spool)
-		hugepage_put_subpool(sbinfo->spool);
+	hugepage_put_subpool(sbinfo->spool);
 	kfree(sbinfo);
 	return -ENOMEM;
 }
mm/hugetlb.c renamed from mm/hugetlb.c~hugetlb-make-hugepage_put_subpool-tolerate-null +3 -0
@@ -182,6 +182,9 @@ void hugepage_put_subpool(struct hugepag
 {
 	unsigned long flags;
 
+	if (!spool)
+		return;
+
 	spin_lock_irqsave(&spool->lock, flags);
 	BUG_ON(!spool->count);
 	spool->count--;

_

Patches currently in -mm which might be from [email protected] are