---

yaml --- r: 155735 b: refs/heads/master c: b600ffa h: refs/heads/master i: 155733: 9411408 155731: b348eeb 155727: 1fd4d77 v: v3
git-mirror · Jul 22, 2009 · 4055f97 · 4055f97
1 parent 4ecf0bf
commit 4055f97
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);
 	}
 }