ocfs2-use-inode_lock_nested-for-orphan-dir-locking.patch removed from -mm tree
The quilt patch titled
Subject: ocfs2: use inode_lock_nested() for orphan dir locking
has been removed from the -mm tree. Its filename was
ocfs2-use-inode_lock_nested-for-orphan-dir-locking.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Deepanshu Kartikey <[email protected]>
Subject: ocfs2: use inode_lock_nested() for orphan dir locking
Date: Sun, 21 Jun 2026 04:42:23 +0530
PREEMPT_RT's rtmutex PI chain walker warns about a lock dependency cycle when inode_lock(orphan_dir_inode) is called while holding inode_lock(file_inode):
ocfs2_file_write_iter()
inode_lock(file_inode) [class 0]
ocfs2_dio_end_io_write()
ocfs2_del_inode_from_orphan()
inode_lock(orphan_dir_inode) [class 0] <- warning!
However this is a false positive. write_iter() is never called on a directory, and orphan_dir is always a directory, so these two locks can never actually conflict in practice.
Fix by using inode_lock_nested(orphan_dir_inode, I_MUTEX_NONDIR2) in all three places where orphan_dir_inode is locked in namei.c, placing it in a separate lock class so the rtmutex PI chain walker understands these locks have distinct roles and does not warn about their ordering.
---
fs/ocfs2/namei.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/ocfs2/namei.c renamed from fs/ocfs2/namei.c~ocfs2-use-inode_lock_nested-for-orphan-dir-locking +3 -3
@@ -2126,7 +2126,7 @@ static int ocfs2_lookup_lock_orphan_dir(return ret; } -inode_lock (orphan_dir_inode); +inode_lock_nested (orphan_dir_inode,I_MUTEX_NONDIR2 ); ret =ocfs2_inode_lock (orphan_dir_inode, &orphan_dir_bh,1 );if (ret <0 ) {
@@ -2725,7 +2725,7 @@ int ocfs2_del_inode_from_orphan(struct o goto bail; } -inode_lock (orphan_dir_inode); +inode_lock_nested (orphan_dir_inode,I_MUTEX_NONDIR2 ); status =ocfs2_inode_lock (orphan_dir_inode, &orphan_dir_bh,1 );if (status <0 ) {inode_unlock (orphan_dir_inode);
@@ -2838,7 +2838,7 @@ int ocfs2_mv_orphaned_inode_to_new(struc goto leave; } -inode_lock (orphan_dir_inode); +inode_lock_nested (orphan_dir_inode,I_MUTEX_NONDIR2 ); status =ocfs2_inode_lock (orphan_dir_inode, &orphan_dir_bh,1 );if (status <0 ) {
_
Patches currently in -mm which might be from [email protected] are