aboutsummaryrefslogtreecommitdiff
path: root/fs/ext4
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2014-07-05 19:18:22 -0400
committerQiming Wu <wuqm@marvell.com>2014-11-19 18:42:14 +0800
commit6e4522cf0b9c58410b91afef858dfde21c5b9ff1 (patch)
tree5de45de0fb6567f2a756b4a20023ed9c7fb772f5 /fs/ext4
parente2bfcfdff7a648edb355019b1c3b06f0ea9258cd (diff)
downloadpxa-v3.14-6e4522cf0b9c58410b91afef858dfde21c5b9ff1.tar.gz
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. Change-Id: I5a5ebc0d0278934824c1e1cc0d29bf73f1a0f250 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> Signed-off-by: Jialing Fu <jlfu@marvell.com>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/super.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index a81a3da01c2..25b327e8731 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1519,8 +1519,6 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token,
arg = JBD2_DEFAULT_MAX_COMMIT_AGE;
sbi->s_commit_interval = HZ * arg;
} else if (token == Opt_max_batch_time) {
- if (arg == 0)
- arg = EXT4_DEF_MAX_BATCH_TIME;
sbi->s_max_batch_time = arg;
} else if (token == Opt_min_batch_time) {
sbi->s_min_batch_time = arg;