diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2007-03-06 10:42:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 18:30:25 +0100 |
| commit | 7a434814c7a6500b08bf4419ba8712b152d08d08 (patch) | |
| tree | 0d97d3d1d1239b3a58a2b5097f63578efc7a0f6d /ipc | |
| parent | [PATCH] remove arch/i386/kernel/tsc.c:custom_sched_clock (diff) | |
| download | linux-7a434814c7a6500b08bf4419ba8712b152d08d08.tar.xz linux-7a434814c7a6500b08bf4419ba8712b152d08d08.zip | |
[PATCH] mqueue: nested locking annotation
Fix http://bugzilla.kernel.org/show_bug.cgi?id=8130
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/mqueue.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 0b5ecbe5f045..554ac368be79 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c @@ -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); |