commit 81cbf6d0555d77b2a4235c03f24167e2d792ccf5
author Linus Torvalds <torvalds@linux-foundation.org> Wed Jul 22 16:44:18 2009 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Jul 22 16:44:18 2009 -0700
tree 8731a6d387158445ff3590e48842b7c097e0dcd6
parent 3c3301083e3bea4d14c597106c7b20b4b85fc03d
parent 023d43c7b5a23a81fe8afa9f37296f8ed4be11fb

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()

fs/pipe.c

diff --git a/fs/pipe.c b/fs/pipe.c
index f7dd21a..52c4151 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -68,8 +68,8 @@
 		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);
 	}
 }