From: Jiro SEKIBA Date: Wed, 22 Jul 2009 16:26:33 +0000 (+0900) Subject: nilfs2: fix disorder of nilfs_write_super in nilfs_sync_fs X-Git-Tag: v2.6.32-rc1~700^2~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6233caa9d5b153c2190d6c1c35c1dd1010104fc1;p=platform%2Fupstream%2Fkernel-adaptation-pc.git 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 Signed-off-by: Ryusuke Konishi --- diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c index e543eda..9926a1d6 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; }