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);
 	}
 }