From 4055f97c8b10ec588f6de91b8df3994ecdb154fd Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 22 Jul 2009 16:44:33 -0700
Subject: [PATCH] --- yaml --- r: 155735 b: refs/heads/master c:
 b600ffaebcc4791add19e04306f0478a963abe71 h: refs/heads/master i:   155733:
 9411408559cdc5a873447d480e4669552226e144   155731:
 b348eeb6f71bb2ff19f40b94d55799490453e1cb   155727:
 1fd4d774cfc1a5c516d37ac8d2f3c8a7ddaafe9c v: v3

---
 [refs]          | 2 +-
 trunk/fs/pipe.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1f65eec7aad2..466c19d803d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61f3826133dc07142935fb5712fc738e19eb5575
+refs/heads/master: b600ffaebcc4791add19e04306f0478a963abe71
diff --git a/trunk/fs/pipe.c b/trunk/fs/pipe.c
index f7dd21ad85a6..52c415114838 100644
--- a/trunk/fs/pipe.c
+++ b/trunk/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);
 	}
 }