---

yaml --- r: 96248 b: refs/heads/master c: 02539d7 h: refs/heads/master v: v3
git-mirror · May 8, 2008 · cac06be · cac06be
1 parent c4efd29
commit cac06be
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a28a1549f9514f3b0dd3dde5c7337ba5d44fba3
+refs/heads/master: 02539d71fa98d5737bb668b02286c76241e4bac9
diff --git a/trunk/arch/powerpc/platforms/cell/spufs/inode.c b/trunk/arch/powerpc/platforms/cell/spufs/inode.c
@@ -224,7 +224,7 @@ static int spufs_dir_close(struct inode *inode, struct file *file)
 	parent = dir->d_parent->d_inode;
 	ctx = SPUFS_I(dir->d_inode)->i_ctx;
 
-	mutex_lock(&parent->i_mutex);
+	mutex_lock_nested(&parent->i_mutex, I_MUTEX_PARENT);
 	ret = spufs_rmdir(parent, dir);
 	mutex_unlock(&parent->i_mutex);
 	WARN_ON(ret);