diff options
author | Christoph Hellwig <hch@lst.de> | 2009-05-05 09:40:36 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-11 21:36:07 -0400 |
commit | 6cfd0148425e528b859b26e436b01f23f6926224 (patch) | |
tree | 60e3257053554ff198fe5825e6f12a00c3b4422a /fs/ext4 | |
parent | a9e220f8322e2b0e0b8903fe00265461cffad3f0 (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/ext4')
-rw-r--r-- | fs/ext4/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 0d3034c5e8a4..1d4180b86772 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -577,6 +577,7 @@ static void ext4_put_super(struct super_block *sb) | |||
577 | int i, err; | 577 | int i, err; |
578 | 578 | ||
579 | lock_super(sb); | 579 | lock_super(sb); |
580 | lock_kernel(); | ||
580 | if (sb->s_dirt) | 581 | if (sb->s_dirt) |
581 | ext4_write_super(sb); | 582 | ext4_write_super(sb); |
582 | 583 | ||
@@ -646,7 +647,6 @@ static void ext4_put_super(struct super_block *sb) | |||
646 | unlock_super(sb); | 647 | unlock_super(sb); |
647 | kobject_put(&sbi->s_kobj); | 648 | kobject_put(&sbi->s_kobj); |
648 | wait_for_completion(&sbi->s_kobj_unregister); | 649 | wait_for_completion(&sbi->s_kobj_unregister); |
649 | lock_kernel(); | ||
650 | kfree(sbi->s_blockgroup_lock); | 650 | kfree(sbi->s_blockgroup_lock); |
651 | kfree(sbi); | 651 | kfree(sbi); |
652 | } | 652 | } |