The patch titled
mqueue: nested locking annotation
has been removed from the -mm tree. Its filename was
mqueue-nested-locking-annotation.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: mqueue: nested locking annotation
From: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Fix http://bugzilla.kernel.org/show_bug.cgi?id=8130
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
ipc/mqueue.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN ipc/mqueue.c~mqueue-nested-locking-annotation ipc/mqueue.c
--- a/ipc/mqueue.c~mqueue-nested-locking-annotation
+++ a/ipc/mqueue.c
@@ -731,7 +731,8 @@ asmlinkage long sys_mq_unlink(const char
if (IS_ERR(name))
return PTR_ERR(name);
- mutex_lock(&mqueue_mnt->mnt_root->d_inode->i_mutex);
+ mutex_lock_nested(&mqueue_mnt->mnt_root->d_inode->i_mutex,
+ I_MUTEX_PARENT);
dentry = lookup_one_len(name, mqueue_mnt->mnt_root, strlen(name));
if (IS_ERR(dentry)) {
err = PTR_ERR(dentry);
_
Patches currently in -mm which might be from a.p.zijlstra@xxxxxxxxx are
origin.patch
ecryptfs-nested-locking-annotation.patch
nfs-fix-congestion-control-v4.patch
nfs-fix-congestion-control-use-atomic_longs.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
