summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorJiro SEKIBA <jir@unicus.jp>2009-07-22 20:26:33 +0400
committerRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>2009-09-14 13:27:14 +0400
commit6233caa9d5b153c2190d6c1c35c1dd1010104fc1 (patch)
tree885fdeacf10bbbecebf94fc274bfd84ff28066f6 /fs
parentec5d66abdb0caf8b753a138568f20770a3d64c8c (diff)
downloadlinux-6233caa9d5b153c2190d6c1c35c1dd1010104fc1.tar.xz
nilfs2: fix disorder of nilfs_write_super in nilfs_sync_fs
This fixes disorder of nilfs_write_super in nilfs_sync_fs. Commiting super block must be the end of the function so that every changes are reflected. ->sync_fs() is not called frequently so this makes nilfs_sync_fs call nilfs_commit_super instead of nilfs_write_super. Signed-off-by: Jiro SEKIBA <jir@unicus.jp> Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Diffstat (limited to 'fs')
-rw-r--r--fs/nilfs2/super.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index e543eda0d939..9926a1d6d225 100644
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -385,13 +385,19 @@ static void nilfs_write_super(struct super_block *sb)
static int nilfs_sync_fs(struct super_block *sb, int wait)
{
+ struct nilfs_sb_info *sbi = NILFS_SB(sb);
+ struct the_nilfs *nilfs = sbi->s_nilfs;
int err = 0;
- nilfs_write_super(sb);
-
/* This function is called when super block should be written back */
if (wait)
err = nilfs_construct_segment(sb);
+
+ down_write(&nilfs->ns_sem);
+ if (sb->s_dirt)
+ nilfs_commit_super(sbi, 1);
+ up_write(&nilfs->ns_sem);
+
return err;
}