diff options
Diffstat (limited to 'fs/ext4')
-rw-r--r-- | fs/ext4/super.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 32e3ecb35cd7..effd375ece80 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -688,16 +688,16 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs) | |||
688 | le16_to_cpu(es->s_def_resgid) != EXT4_DEF_RESGID) { | 688 | le16_to_cpu(es->s_def_resgid) != EXT4_DEF_RESGID) { |
689 | seq_printf(seq, ",resgid=%u", sbi->s_resgid); | 689 | seq_printf(seq, ",resgid=%u", sbi->s_resgid); |
690 | } | 690 | } |
691 | if (test_opt(sb, ERRORS_CONT)) { | 691 | if (test_opt(sb, ERRORS_RO)) { |
692 | int def_errors = le16_to_cpu(es->s_errors); | 692 | int def_errors = le16_to_cpu(es->s_errors); |
693 | 693 | ||
694 | if (def_errors == EXT4_ERRORS_PANIC || | 694 | if (def_errors == EXT4_ERRORS_PANIC || |
695 | def_errors == EXT4_ERRORS_RO) { | 695 | def_errors == EXT4_ERRORS_CONTINUE) { |
696 | seq_puts(seq, ",errors=continue"); | 696 | seq_puts(seq, ",errors=remount-ro"); |
697 | } | 697 | } |
698 | } | 698 | } |
699 | if (test_opt(sb, ERRORS_RO)) | 699 | if (test_opt(sb, ERRORS_CONT)) |
700 | seq_puts(seq, ",errors=remount-ro"); | 700 | seq_puts(seq, ",errors=continue"); |
701 | if (test_opt(sb, ERRORS_PANIC)) | 701 | if (test_opt(sb, ERRORS_PANIC)) |
702 | seq_puts(seq, ",errors=panic"); | 702 | seq_puts(seq, ",errors=panic"); |
703 | if (test_opt(sb, NO_UID32)) | 703 | if (test_opt(sb, NO_UID32)) |
@@ -1819,10 +1819,10 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent) | |||
1819 | 1819 | ||
1820 | if (le16_to_cpu(sbi->s_es->s_errors) == EXT4_ERRORS_PANIC) | 1820 | if (le16_to_cpu(sbi->s_es->s_errors) == EXT4_ERRORS_PANIC) |
1821 | set_opt(sbi->s_mount_opt, ERRORS_PANIC); | 1821 | set_opt(sbi->s_mount_opt, ERRORS_PANIC); |
1822 | else if (le16_to_cpu(sbi->s_es->s_errors) == EXT4_ERRORS_RO) | 1822 | else if (le16_to_cpu(sbi->s_es->s_errors) == EXT4_ERRORS_CONTINUE) |
1823 | set_opt(sbi->s_mount_opt, ERRORS_RO); | ||
1824 | else | ||
1825 | set_opt(sbi->s_mount_opt, ERRORS_CONT); | 1823 | set_opt(sbi->s_mount_opt, ERRORS_CONT); |
1824 | else | ||
1825 | set_opt(sbi->s_mount_opt, ERRORS_RO); | ||
1826 | 1826 | ||
1827 | sbi->s_resuid = le16_to_cpu(es->s_def_resuid); | 1827 | sbi->s_resuid = le16_to_cpu(es->s_def_resuid); |
1828 | sbi->s_resgid = le16_to_cpu(es->s_def_resgid); | 1828 | sbi->s_resgid = le16_to_cpu(es->s_def_resgid); |