[merged mm-stable] hugetlb-make-hugepage_put_subpool-tolerate-null.patch removed from -mm tree
Andrew Morton <[email protected]>
| Newsgroups | org.kernel.vger.mm-commits |
|---|---|
| Message-ID | <[email protected]> |
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.
Link: https://lore.kernel.org/[email protected]
Signed-off-by: Yichong Chen <[email protected]>
Reviewed-by: Muchun Song <[email protected]>
Cc: David Hildenbrand <[email protected]>
Cc: Oscar Salvador <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---
fs/hugetlbfs/inode.c | 6 ++----
mm/hugetlb.c | 3 +++
2 files changed, 5 insertions(+), 4 deletions(-)
--- a/fs/hugetlbfs/inode.c~hugetlb-make-hugepage_put_subpool-tolerate-null
+++ a/fs/hugetlbfs/inode.c
@@ -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;
}
--- a/mm/hugetlb.c~hugetlb-make-hugepage_put_subpool-tolerate-null
+++ a/mm/hugetlb.c
@@ -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