Skip to contentSkip to conversation

hugetlbfs-fix-hugetlbfs_statfs-locking.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message May 10, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: hugetlbfs: fix hugetlbfs_statfs() locking
has been removed from the -mm tree. Its filename was
hugetlbfs-fix-hugetlbfs_statfs-locking.patch

This patch was dropped because it was merged into mm-stable

------------------------------------------------------
From: Mina Almasry <[email protected]>
Subject: hugetlbfs: fix hugetlbfs_statfs() locking

After commit db71ef79b59b ("hugetlb: make free_huge_page irq safe"), the subpool lock should be locked with spin_lock_irq() and all call sites was modified as such, except for the ones in hugetlbfs_statfs().

Fixes db71ef79b59b ("hugetlb: make free_huge_page irq safe")

---

 fs/hugetlbfs/inode.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
fs/hugetlbfs/inode.c renamed from fs/hugetlbfs/inode.c~hugetlbfs-fix-hugetlbfs_statfs-locking +2 -2
@@ -1048,12 +1048,12 @@ static int hugetlbfs_statfs(struct dentr
 		if (sbinfo->spool) {
 			long free_pages;
 
-			spin_lock(&sbinfo->spool->lock);
+			spin_lock_irq(&sbinfo->spool->lock);
 			buf->f_blocks = sbinfo->spool->max_hpages;
 			free_pages = sbinfo->spool->max_hpages
 				- sbinfo->spool->used_hpages;
 			buf->f_bavail = buf->f_bfree = free_pages;
-			spin_unlock(&sbinfo->spool->lock);
+			spin_unlock_irq(&sbinfo->spool->lock);
 			buf->f_files = sbinfo->max_inodes;
 			buf->f_ffree = sbinfo->free_inodes;
 		}

_

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