Skip to content

Commit

Permalink
ext3: revert "ext3: wait on all pending commits in ext3_sync_fs"
Browse files Browse the repository at this point in the history
This reverts commit c87591b.

Since journal_start_commit() is now fixed to return 1 when we started a
transaction commit, there's some transaction waiting to be committed or
there's a transaction already committing, we don't need to call
ext3_force_commit() in ext3_sync_fs().  Furthermore ext3_force_commit()
can unnecessarily create sync transaction which is expensive so it's
worthwhile to remove it when we can.

Cc: Eric Sandeen <sandeen@redhat.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jan Kara authored and Linus Torvalds committed Feb 11, 2009
1 parent 8fe4cd0 commit 02ac597
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions fs/ext3/super.c
Original file line number Diff line number Diff line change
@@ -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;
}

0 comments on commit 02ac597

Please sign in to comment.