1 ext4: print ext4 mount option data_err=abort correctly
3 From: Ales Novak <alnovak@suse.cz>
5 If data_err=abort option is specified for an ext3/ext4 mount,
6 /proc/mounts does show it as "(null)". This is caused by token2str()
7 returning NULL for Opt_data_err_abort (due to its pattern containing
10 Signed-off-by: Ales Novak <alnovak@suse.cz>
11 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
13 fs/ext4/super.c | 10 ++++++++--
14 1 file changed, 8 insertions(+), 2 deletions(-)
16 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
17 index 3ed01ec..19e589c 100644
20 @@ -1425,9 +1425,9 @@ static const struct mount_opts {
21 {Opt_err_ro, EXT4_MOUNT_ERRORS_RO, MOPT_SET | MOPT_CLEAR_ERR},
22 {Opt_err_cont, EXT4_MOUNT_ERRORS_CONT, MOPT_SET | MOPT_CLEAR_ERR},
23 {Opt_data_err_abort, EXT4_MOUNT_DATA_ERR_ABORT,
24 - MOPT_NO_EXT2 | MOPT_SET},
26 {Opt_data_err_ignore, EXT4_MOUNT_DATA_ERR_ABORT,
27 - MOPT_NO_EXT2 | MOPT_CLEAR},
29 {Opt_barrier, EXT4_MOUNT_BARRIER, MOPT_SET},
30 {Opt_nobarrier, EXT4_MOUNT_BARRIER, MOPT_CLEAR},
31 {Opt_noauto_da_alloc, EXT4_MOUNT_NO_AUTO_DA_ALLOC, MOPT_SET},
32 @@ -1705,6 +1705,10 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token,
33 ext4_msg(sb, KERN_INFO, "dax option not supported");
36 + } else if (token == Opt_data_err_abort) {
37 + sbi->s_mount_opt |= m->mount_opt;
38 + } else if (token == Opt_data_err_ignore) {
39 + sbi->s_mount_opt &= ~m->mount_opt;
43 @@ -1914,6 +1918,8 @@ static int _ext4_show_options(struct seq_file *seq, struct super_block *sb,
44 SEQ_OPTS_PRINT("init_itable=%u", sbi->s_li_wait_mult);
45 if (nodefs || sbi->s_max_dir_size_kb)
46 SEQ_OPTS_PRINT("max_dir_size_kb=%u", sbi->s_max_dir_size_kb);
47 + if (test_opt(sb, DATA_ERR_ABORT))
48 + SEQ_OPTS_PUTS("data_err=abort");
50 ext4_show_quota_options(seq, sb);