diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-22 16:44:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-22 16:44:18 -0700 |
| commit | 81cbf6d0555d77b2a4235c03f24167e2d792ccf5 (patch) | |
| tree | 8731a6d387158445ff3590e48842b7c097e0dcd6 | |
| parent | 3c3301083e3bea4d14c597106c7b20b4b85fc03d (diff) | |
| parent | 023d43c7b5a23a81fe8afa9f37296f8ed4be11fb (diff) | |
| download | linux-3.10-81cbf6d0555d77b2a4235c03f24167e2d792ccf5.tar.gz linux-3.10-81cbf6d0555d77b2a4235c03f24167e2d792ccf5.tar.bz2 linux-3.10-81cbf6d0555d77b2a4235c03f24167e2d792ccf5.zip | |
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()
| -rw-r--r-- | fs/pipe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/pipe.c b/fs/pipe.c index f7dd21ad85a..52c41511483 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -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); } } |