diff options
| author | Jan Kara <jack@suse.cz> | 2009-02-10 06:46:05 -0500 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 2009-02-10 06:46:05 -0500 |
| commit | 9eddacf9e9c03578ef2c07c9534423e823d677f8 (patch) | |
| tree | 6b317bb2e531ba56c9bc7ece8c41ec039d12d309 /fs/ext4/super.c | |
| parent | c88ccea3143975294f5a52097546bcbb75975f52 (diff) | |
| download | linux-3.10-9eddacf9e9c03578ef2c07c9534423e823d677f8.tar.gz linux-3.10-9eddacf9e9c03578ef2c07c9534423e823d677f8.tar.bz2 linux-3.10-9eddacf9e9c03578ef2c07c9534423e823d677f8.zip | |
Revert "ext4: wait on all pending commits in ext4_sync_fs()"
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 <jack@suse.cz>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: Eric Sandeen <sandeen@redhat.com>
Cc: linux-ext4@vger.kernel.org
Diffstat (limited to 'fs/ext4/super.c')
| -rw-r--r-- | fs/ext4/super.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index e5f06a5f045..a5732c58f67 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3046,14 +3046,17 @@ 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; trace_mark(ext4_sync_fs, "dev %s wait %d", sb->s_id, wait); sb->s_dirt = 0; if (EXT4_SB(sb)->s_journal) { - if (wait) - ret = ext4_force_commit(sb); - else - jbd2_journal_start_commit(EXT4_SB(sb)->s_journal, NULL); + if (jbd2_journal_start_commit(EXT4_SB(sb)->s_journal, + &target)) { + if (wait) + jbd2_log_wait_commit(EXT4_SB(sb)->s_journal, + target); + } } else { ext4_commit_super(sb, EXT4_SB(sb)->s_es, wait); } |