diff --git a/[refs] b/[refs] index 8572de38632b..8623fa859db6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8fe4cd0dc5ea43760c59eb256404188272cc95dd +refs/heads/master: 02ac597c9b86af49b2016aa98aee20ab59dbf0d2 diff --git a/trunk/fs/ext3/super.c b/trunk/fs/ext3/super.c index b70d90e08a3c..4a970411a458 100644 --- a/trunk/fs/ext3/super.c +++ b/trunk/fs/ext3/super.c @@ -2428,12 +2428,13 @@ static void ext3_write_super (struct super_block * sb) static int ext3_sync_fs(struct super_block *sb, int wait) { - sb->s_dirt = 0; - if (wait) - ext3_force_commit(sb); - else - journal_start_commit(EXT3_SB(sb)->s_journal, NULL); + tid_t target; + sb->s_dirt = 0; + if (journal_start_commit(EXT3_SB(sb)->s_journal, &target)) { + if (wait) + log_wait_commit(EXT3_SB(sb)->s_journal, target); + } return 0; }