From: Eric Sandeen Date: Sat, 5 Jul 2014 23:18:22 +0000 (-0400) Subject: ext4: disable synchronous transaction batching if max_batch_time==0 X-Git-Tag: v3.2.62~68 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7746e31bf3027ed9172e8b648069e7f2101c198;p=thirdparty%2Fkernel%2Fstable.git ext4: disable synchronous transaction batching if max_batch_time==0 commit 5dd214248f94d430d70e9230bda72f2654ac88a8 upstream. The mount manpage says of the max_batch_time option, This optimization can be turned off entirely by setting max_batch_time to 0. But the code doesn't do that. So fix the code to do that. Signed-off-by: Eric Sandeen Signed-off-by: Theodore Ts'o [bwh: Backported to 3.2: option parsing looks different] Signed-off-by: Ben Hutchings --- diff --git a/fs/ext4/super.c b/fs/ext4/super.c index e32ee5c633876..6581ee7731255 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1663,8 +1663,6 @@ static int parse_options(char *options, struct super_block *sb, return 0; if (option < 0) return 0; - if (option == 0) - option = EXT4_DEF_MAX_BATCH_TIME; sbi->s_max_batch_time = option; break; case Opt_min_batch_time: diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 18ea4d9deded7..86dc68a337f45 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -1388,9 +1388,12 @@ int jbd2_journal_stop(handle_t *handle) * to perform a synchronous write. We do this to detect the * case where a single process is doing a stream of sync * writes. No point in waiting for joiners in that case. + * + * Setting max_batch_time to 0 disables this completely. */ pid = current->pid; - if (handle->h_sync && journal->j_last_sync_writer != pid) { + if (handle->h_sync && journal->j_last_sync_writer != pid && + journal->j_max_batch_time) { u64 commit_time, trans_time; journal->j_last_sync_writer = pid;