From: Theodore Ts'o Subject: [STABLE, 2.6.27.y] Revert "ext4: wait on all pending commits in ext4_sync_fs()" Date: Tue, 24 Feb 2009 12:14:49 -0500 Message-ID: <1235495694-8116-2-git-send-email-tytso@mit.edu> References: <1235495694-8116-1-git-send-email-tytso@mit.edu> Cc: Jan Kara , "Theodore Ts'o" , Eric Sandeen , linux-ext4@vger.kernel.org To: stable@kernel.org Return-path: Received: from thunk.org ([69.25.196.29]:39941 "EHLO thunker.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754752AbZBXRPL (ORCPT ); Tue, 24 Feb 2009 12:15:11 -0500 In-Reply-To: <1235495694-8116-1-git-send-email-tytso@mit.edu> Sender: linux-ext4-owner@vger.kernel.org List-ID: From: Jan Kara This undoes commit 14ce0cb411c88681ab8f3a4c9caa7f42e97a3184. Since jbd2_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 ext4_force_commit() in ext4_sync_fs(). Furthermore ext4_force_commit() can unnecessarily create sync transaction which is expensive so it's worthwhile to remove it when we can. http://bugzilla.kernel.org/show_bug.cgi?id=12224 Signed-off-by: Jan Kara Signed-off-by: "Theodore Ts'o" Cc: Eric Sandeen Cc: linux-ext4@vger.kernel.org (cherry picked from commit 9eddacf9e9c03578ef2c07c9534423e823d677f8) --- fs/ext4/super.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 5e4491d..db2642a 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -2950,14 +2950,14 @@ static void ext4_write_super(struct super_block *sb) static int ext4_sync_fs(struct super_block *sb, int wait) { - int ret = 0; + tid_t target; sb->s_dirt = 0; - if (wait) - ret = ext4_force_commit(sb); - else - jbd2_journal_start_commit(EXT4_SB(sb)->s_journal, NULL); - return ret; + if (jbd2_journal_start_commit(EXT4_SB(sb)->s_journal, &target)) { + if (wait) + jbd2_log_wait_commit(EXT4_SB(sb)->s_journal, target); + } + return 0; } /* -- 1.5.6.3