aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/super.c
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2014-07-05 19:18:22 -0400
committerBen Hutchings <ben@decadent.org.uk>2014-08-06 18:07:34 +0100
commite7746e31bf3027ed9172e8b648069e7f2101c198 (patch)
treea64f7d9cc62e87acc8afc4e6e9ef4f138b41b125 /fs/ext4/super.c
parent5661f259a74876761ed632e05e5b29164e40332c (diff)
downloadkernel_samsung_smdk4412-e7746e31bf3027ed9172e8b648069e7f2101c198.zip
kernel_samsung_smdk4412-e7746e31bf3027ed9172e8b648069e7f2101c198.tar.gz
kernel_samsung_smdk4412-e7746e31bf3027ed9172e8b648069e7f2101c198.tar.bz2
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> [bwh: Backported to 3.2: option parsing looks different] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/ext4/super.c')
-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 e32ee5c..6581ee7 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: