ext3: revert "ext3: wait on all pending commits in ext3_sync_fs"
PATCH 8/24 ext3: revert "ext3: wait on all pending commits in ext3_sync_fs"
From: Jan Kara <[email protected]>
This reverts commit c87591b719737b4e91eb1a9fa8fd55a4ff1886d6.
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 <[email protected]>
Cc <[email protected]>
Signed-off-by Jan Kara <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
fs/ext3/super.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
fs/ext3/super.c renamed from fs/ext3/super.c~revert-ext3-wait-on-all-pending-commits-in-ext3_sync_fs +6 -5
@@ -2428,12 +2428,13 @@ static void ext3_write_super (struct supstatic 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 ; }
_