summaryrefslogtreecommitdiffstats
path: root/fs/reiserfs/bitmap.c
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2012-01-10 15:11:07 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-10 16:30:53 -0800
commitf32485be8397ad811312bc055d2e2a5906bc7576 (patch)
tree3f3ca7a7d8395253189def7742fbd43698dce996 /fs/reiserfs/bitmap.c
parentb18c1c6e0c90cbcd38ba879bd63a44c94e4f7301 (diff)
downloadlinux-stable-f32485be8397ad811312bc055d2e2a5906bc7576.tar.gz
linux-stable-f32485be8397ad811312bc055d2e2a5906bc7576.tar.bz2
linux-stable-f32485be8397ad811312bc055d2e2a5906bc7576.zip
reiserfs: delay reiserfs lock until journal initialization
In the mount path, transactions that are made before journal initialization don't involve the filesystem. We can delay the reiserfs lock until we play with the journal. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Christoph Hellwig <hch@lst.de> Cc: Jeff Mahoney <jeffm@suse.com> Cc: Jan Kara <jack@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/reiserfs/bitmap.c')
-rw-r--r--fs/reiserfs/bitmap.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c
index a945cd265228..70de42f09f1d 100644
--- a/fs/reiserfs/bitmap.c
+++ b/fs/reiserfs/bitmap.c
@@ -1364,10 +1364,7 @@ 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;