Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a434814 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Linus Torvalds
Browse files

[PATCH] mqueue: nested locking annotation 

Fix http://bugzilla.kernel.org/show_bug.cgi?id=8130



Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4a6753ca

ipc/mqueue.c

+2 −1
Original line number Diff line number Diff line
@@ -731,7 +731,8 @@ asmlinkage long sys_mq_unlink(const char __user *u_name) 
	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);