summaryrefslogtreecommitdiffstats
path: root/fs/jbd2
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2014-07-05 19:18:22 -0400
committerTheodore Ts'o <tytso@mit.edu>2014-07-05 19:18:22 -0400
commit5dd214248f94d430d70e9230bda72f2654ac88a8 (patch)
tree756629dd87cf1d0e359f95b8836f53863905f3fc /fs/jbd2
parent94d4c066a4ff170a2671b1a9b153febbf36796f6 (diff)
downloadlinux-5dd214248f94d430d70e9230bda72f2654ac88a8.tar.gz
linux-5dd214248f94d430d70e9230bda72f2654ac88a8.tar.bz2
linux-5dd214248f94d430d70e9230bda72f2654ac88a8.zip
ext4: disable synchronous transaction batching if max_batch_time==0
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> Cc: stable@vger.kernel.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 38cfcf5f6fce..6f0f590cc5a3 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -1588,9 +1588,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;