diff options
author | Theodore Ts'o <tytso@mit.edu> | 2011-02-26 13:53:09 -0500 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2011-02-26 13:53:09 -0500 |
commit | 6fd7a46781999c32f423025767e43b349b967d57 (patch) | |
tree | cb324e785e6e00c29ba522c5b76a2bfdfee7b1ab /fs | |
parent | c7f5938adce6727b9d17785f289c1146bd88d678 (diff) |
ext4: enable mblk_io_submit by default
Now that we've fixed the file corruption bug in commit d50bdd5aa55,
it's time to enable mblk_io_submit by default.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext4/super.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index a665d2fb70c1..33c398785e53 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -1038,8 +1038,8 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs) | |||
1038 | !(def_mount_opts & EXT4_DEFM_NODELALLOC)) | 1038 | !(def_mount_opts & EXT4_DEFM_NODELALLOC)) |
1039 | seq_puts(seq, ",nodelalloc"); | 1039 | seq_puts(seq, ",nodelalloc"); |
1040 | 1040 | ||
1041 | if (test_opt(sb, MBLK_IO_SUBMIT)) | 1041 | if (!test_opt(sb, MBLK_IO_SUBMIT)) |
1042 | seq_puts(seq, ",mblk_io_submit"); | 1042 | seq_puts(seq, ",nomblk_io_submit"); |
1043 | if (sbi->s_stripe) | 1043 | if (sbi->s_stripe) |
1044 | seq_printf(seq, ",stripe=%lu", sbi->s_stripe); | 1044 | seq_printf(seq, ",stripe=%lu", sbi->s_stripe); |
1045 | /* | 1045 | /* |
@@ -3099,6 +3099,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) | |||
3099 | #ifdef CONFIG_EXT4_FS_POSIX_ACL | 3099 | #ifdef CONFIG_EXT4_FS_POSIX_ACL |
3100 | set_opt(sb, POSIX_ACL); | 3100 | set_opt(sb, POSIX_ACL); |
3101 | #endif | 3101 | #endif |
3102 | set_opt(sb, MBLK_IO_SUBMIT); | ||
3102 | if ((def_mount_opts & EXT4_DEFM_JMODE) == EXT4_DEFM_JMODE_DATA) | 3103 | if ((def_mount_opts & EXT4_DEFM_JMODE) == EXT4_DEFM_JMODE_DATA) |
3103 | set_opt(sb, JOURNAL_DATA); | 3104 | set_opt(sb, JOURNAL_DATA); |
3104 | else if ((def_mount_opts & EXT4_DEFM_JMODE) == EXT4_DEFM_JMODE_ORDERED) | 3105 | else if ((def_mount_opts & EXT4_DEFM_JMODE) == EXT4_DEFM_JMODE_ORDERED) |