From: akpm@linux-foundation.org Subject: [merged] revert-ext3-wait-on-all-pending-commits-in-ext3_sync_fs.patch removed from -mm tree Date: Thu, 12 Feb 2009 12:25:20 -0800 Message-ID: <200902122025.n1CKPKa5014453@imap1.linux-foundation.org> To: jack@suse.cz, linux-ext4@vger.kernel.org, sandeen@redhat.com, mm-commits@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:55290 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753178AbZBLUfk (ORCPT ); Thu, 12 Feb 2009 15:35:40 -0500 Sender: linux-ext4-owner@vger.kernel.org List-ID: The patch titled ext3: revert "ext3: wait on all pending commits in ext3_sync_fs" has been removed from the -mm tree. Its filename was revert-ext3-wait-on-all-pending-commits-in-ext3_sync_fs.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: ext3: revert "ext3: wait on all pending commits in ext3_sync_fs" From: Jan Kara 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 Cc: Signed-off-by: Jan Kara Signed-off-by: Andrew Morton --- fs/ext3/super.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff -puN fs/ext3/super.c~revert-ext3-wait-on-all-pending-commits-in-ext3_sync_fs fs/ext3/super.c --- a/fs/ext3/super.c~revert-ext3-wait-on-all-pending-commits-in-ext3_sync_fs +++ a/fs/ext3/super.c @@ -2428,12 +2428,13 @@ static void ext3_write_super (struct sup 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; } _ Patches currently in -mm which might be from jack@suse.cz are origin.patch linux-next.patch ext2-add-blk_issue_flush-to-syncing-paths.patch jbd-fix-oops-in-jbd_journal_init_inode-on-corrupted-fs.patch fs-adfs-return-f_fsid-for-statfs2.patch