Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2016-03-30 11:15:05 +0200
committerMichal Marek <mmarek@suse.cz>2016-03-30 11:15:05 +0200
commitfeb3cb8583b906d8f17c13817ff398566a9803f4 (patch)
tree6a5f0ac6db2295d51381c0559a977e3219a35973
parent72043880aefde29052169879562bd8e62381abd6 (diff)
parent836f54520f3bf3337318e67ae30db3ab432a5888 (diff)
Merge branch 'users/alnovak/SLE12-SP2/for-next' into SLE12-SP2rpm-4.4.6-30
Pull ext4 fix from Aleš Novák (bsc#969735). suse-commit: 4e11b552f23a15103aabd3fd50866f5ef19eff15
-rw-r--r--fs/ext4/super.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index a7b6aaa871aa..b78c4e1e4ef4 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1394,9 +1394,9 @@ static const struct mount_opts {
{Opt_err_ro, EXT4_MOUNT_ERRORS_RO, MOPT_SET | MOPT_CLEAR_ERR},
{Opt_err_cont, EXT4_MOUNT_ERRORS_CONT, MOPT_SET | MOPT_CLEAR_ERR},
{Opt_data_err_abort, EXT4_MOUNT_DATA_ERR_ABORT,
- MOPT_NO_EXT2 | MOPT_SET},
+ MOPT_NO_EXT2},
{Opt_data_err_ignore, EXT4_MOUNT_DATA_ERR_ABORT,
- MOPT_NO_EXT2 | MOPT_CLEAR},
+ MOPT_NO_EXT2},
{Opt_barrier, EXT4_MOUNT_BARRIER, MOPT_SET},
{Opt_nobarrier, EXT4_MOUNT_BARRIER, MOPT_CLEAR},
{Opt_noauto_da_alloc, EXT4_MOUNT_NO_AUTO_DA_ALLOC, MOPT_SET},
@@ -1674,6 +1674,10 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token,
ext4_msg(sb, KERN_INFO, "dax option not supported");
return -1;
#endif
+ } else if (token == Opt_data_err_abort) {
+ sbi->s_mount_opt |= m->mount_opt;
+ } else if (token == Opt_data_err_ignore) {
+ sbi->s_mount_opt &= ~m->mount_opt;
} else {
if (!args->from)
arg = 1;
@@ -1883,6 +1887,8 @@ static int _ext4_show_options(struct seq_file *seq, struct super_block *sb,
SEQ_OPTS_PRINT("init_itable=%u", sbi->s_li_wait_mult);
if (nodefs || sbi->s_max_dir_size_kb)
SEQ_OPTS_PRINT("max_dir_size_kb=%u", sbi->s_max_dir_size_kb);
+ if (test_opt(sb, DATA_ERR_ABORT))
+ SEQ_OPTS_PUTS("data_err=abort");
ext4_show_quota_options(seq, sb);
return 0;