---

yaml --- r: 178716 b: refs/heads/master c: 500f5a0 h: refs/heads/master v: v3
git-mirror · Dec 14, 2009 · 3115f25 · 3115f25
1 parent 372a35b
commit 3115f25
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6548698f929814375fa5d62ae1db96959b0418c1
+refs/heads/master: 500f5a0bf5f0624dae34307010e240ec090e4cde
diff --git a/trunk/fs/reiserfs/bitmap.c b/trunk/fs/reiserfs/bitmap.c
@@ -1277,7 +1277,10 @@ int reiserfs_init_bitmap_cache(struct super_block *sb)
 	struct reiserfs_bitmap_info *bitmap;
 	unsigned int bmap_nr = reiserfs_bmap_count(sb);
 
+	/* Avoid lock recursion in fault case */
+	reiserfs_write_unlock(sb);
 	bitmap = vmalloc(sizeof(*bitmap) * bmap_nr);
+	reiserfs_write_lock(sb);
 	if (bitmap == NULL)
 		return -ENOMEM;