summaryrefslogtreecommitdiff
path: root/fs/jbd2
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2014-07-05 19:18:22 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-17 15:58:03 -0700
commit39f9c0e3dd12d559da1ad14a3082b02683285c8d (patch)
tree5bfd9997241de6d2e5091922e35852f0eb74cb88 /fs/jbd2
parent9625fe1e2e1cd490b8c368397146d26132380866 (diff)
downloadlinux-3.10-39f9c0e3dd12d559da1ad14a3082b02683285c8d.tar.gz
linux-3.10-39f9c0e3dd12d559da1ad14a3082b02683285c8d.tar.bz2
linux-3.10-39f9c0e3dd12d559da1ad14a3082b02683285c8d.zip
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 <sandeen@redhat.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/jbd2')
-rw-r--r--fs/jbd2/transaction.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index a6917125f21..ec34e11d685 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -1442,9 +1442,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;