summaryrefslogtreecommitdiff
path: root/fs/ext4
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/ext4
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/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 3cc2a4b57c0..1fc14f7a08b 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1483,8 +1483,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;