aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nilfs2
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/nilfs2
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/nilfs2')
-rw-r--r--fs/nilfs2/super.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index 7901d8cbb9b1..7262e8427c20 100644
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -316,6 +316,8 @@ static void nilfs_put_super(struct super_block *sb)
316 struct nilfs_sb_info *sbi = NILFS_SB(sb); 316 struct nilfs_sb_info *sbi = NILFS_SB(sb);
317 struct the_nilfs *nilfs = sbi->s_nilfs; 317 struct the_nilfs *nilfs = sbi->s_nilfs;
318 318
319 lock_kernel();
320
319 if (sb->s_dirt) 321 if (sb->s_dirt)
320 nilfs_write_super(sb); 322 nilfs_write_super(sb);
321 323
@@ -333,6 +335,8 @@ static void nilfs_put_super(struct super_block *sb)
333 sbi->s_super = NULL; 335 sbi->s_super = NULL;
334 sb->s_fs_info = NULL; 336 sb->s_fs_info = NULL;
335 kfree(sbi); 337 kfree(sbi);
338
339 unlock_kernel();
336} 340}
337 341
338/** 342/**