aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext3
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2009-05-05 09:40:36 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2009-06-11 21:36:07 -0400
commit6cfd0148425e528b859b26e436b01f23f6926224 (patch)
tree60e3257053554ff198fe5825e6f12a00c3b4422a /fs/ext3
parenta9e220f8322e2b0e0b8903fe00265461cffad3f0 (diff)
push BKL down into ->put_super
Move BKL into ->put_super from the only caller. A couple of filesystems had trivial enough ->put_super (only kfree and NULLing of s_fs_info + stuff in there) to not get any locking: coda, cramfs, efs, hugetlbfs, omfs, qnx4, shmem, all others got the full treatment. Most of them probably don't need it, but I'd rather sort that out individually. Preferably after all the other BKL pushdowns in that area. [AV: original used to move lock_super() down as well; these changes are removed since we don't do lock_super() at all in generic_shutdown_super() now] [AV: fuse, btrfs and xfs are known to need no damn BKL, exempt] Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ext3')
-rw-r--r--fs/ext3/super.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 1efd958687e9..546b8d732bf2 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -398,6 +398,8 @@ static void ext3_put_super (struct super_block * sb)
398 struct ext3_super_block *es = sbi->s_es; 398 struct ext3_super_block *es = sbi->s_es;
399 int i, err; 399 int i, err;
400 400
401 lock_kernel();
402
401 ext3_xattr_put_super(sb); 403 ext3_xattr_put_super(sb);
402 err = journal_destroy(sbi->s_journal); 404 err = journal_destroy(sbi->s_journal);
403 sbi->s_journal = NULL; 405 sbi->s_journal = NULL;
@@ -446,7 +448,8 @@ static void ext3_put_super (struct super_block * sb)
446 sb->s_fs_info = NULL; 448 sb->s_fs_info = NULL;
447 kfree(sbi->s_blockgroup_lock); 449 kfree(sbi->s_blockgroup_lock);
448 kfree(sbi); 450 kfree(sbi);
449 return; 451
452 unlock_kernel();
450} 453}
451 454
452static struct kmem_cache *ext3_inode_cachep; 455static struct kmem_cache *ext3_inode_cachep;