aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext2
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/ext2
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/ext2')
-rw-r--r--fs/ext2/super.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 932a2bcb6908..a44963d8edbd 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -114,6 +114,8 @@ static void ext2_put_super (struct super_block * sb)
114 int i; 114 int i;
115 struct ext2_sb_info *sbi = EXT2_SB(sb); 115 struct ext2_sb_info *sbi = EXT2_SB(sb);
116 116
117 lock_kernel();
118
117 if (sb->s_dirt) 119 if (sb->s_dirt)
118 ext2_write_super(sb); 120 ext2_write_super(sb);
119 121
@@ -138,7 +140,7 @@ static void ext2_put_super (struct super_block * sb)
138 kfree(sbi->s_blockgroup_lock); 140 kfree(sbi->s_blockgroup_lock);
139 kfree(sbi); 141 kfree(sbi);
140 142
141 return; 143 unlock_kernel();
142} 144}
143 145
144static struct kmem_cache * ext2_inode_cachep; 146static struct kmem_cache * ext2_inode_cachep;