Merge branch 'lockdep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep
* 'lockdep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep: lockdep: Fix lockdep annotation for pipe_double_lock()
This commit is contained in:
commit
81cbf6d055
1 changed files with 2 additions and 2 deletions
|
@ -68,8 +68,8 @@ void pipe_double_lock(struct pipe_inode_info *pipe1,
|
|||
pipe_lock_nested(pipe1, I_MUTEX_PARENT);
|
||||
pipe_lock_nested(pipe2, I_MUTEX_CHILD);
|
||||
} else {
|
||||
pipe_lock_nested(pipe2, I_MUTEX_CHILD);
|
||||
pipe_lock_nested(pipe1, I_MUTEX_PARENT);
|
||||
pipe_lock_nested(pipe2, I_MUTEX_PARENT);
|
||||
pipe_lock_nested(pipe1, I_MUTEX_CHILD);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue