diff options
| -rw-r--r-- | fs/ext3/super.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index f3675cc630e9..15e75139b7e8 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c | |||
| @@ -575,16 +575,16 @@ static int ext3_show_options(struct seq_file *seq, struct vfsmount *vfs) | |||
| 575 | le16_to_cpu(es->s_def_resgid) != EXT3_DEF_RESGID) { | 575 | le16_to_cpu(es->s_def_resgid) != EXT3_DEF_RESGID) { |
| 576 | seq_printf(seq, ",resgid=%u", sbi->s_resgid); | 576 | seq_printf(seq, ",resgid=%u", sbi->s_resgid); |
| 577 | } | 577 | } |
| 578 | if (test_opt(sb, ERRORS_CONT)) { | 578 | if (test_opt(sb, ERRORS_RO)) { |
| 579 | int def_errors = le16_to_cpu(es->s_errors); | 579 | int def_errors = le16_to_cpu(es->s_errors); |
| 580 | 580 | ||
| 581 | if (def_errors == EXT3_ERRORS_PANIC || | 581 | if (def_errors == EXT3_ERRORS_PANIC || |
| 582 | def_errors == EXT3_ERRORS_RO) { | 582 | def_errors == EXT3_ERRORS_CONTINUE) { |
| 583 | seq_puts(seq, ",errors=continue"); | 583 | seq_puts(seq, ",errors=remount-ro"); |
| 584 | } | 584 | } |
| 585 | } | 585 | } |
| 586 | if (test_opt(sb, ERRORS_RO)) | 586 | if (test_opt(sb, ERRORS_CONT)) |
| 587 | seq_puts(seq, ",errors=remount-ro"); | 587 | seq_puts(seq, ",errors=continue"); |
| 588 | if (test_opt(sb, ERRORS_PANIC)) | 588 | if (test_opt(sb, ERRORS_PANIC)) |
| 589 | seq_puts(seq, ",errors=panic"); | 589 | seq_puts(seq, ",errors=panic"); |
| 590 | if (test_opt(sb, NO_UID32)) | 590 | if (test_opt(sb, NO_UID32)) |
| @@ -1583,10 +1583,10 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) | |||
| 1583 | 1583 | ||
| 1584 | if (le16_to_cpu(sbi->s_es->s_errors) == EXT3_ERRORS_PANIC) | 1584 | if (le16_to_cpu(sbi->s_es->s_errors) == EXT3_ERRORS_PANIC) |
| 1585 | set_opt(sbi->s_mount_opt, ERRORS_PANIC); | 1585 | set_opt(sbi->s_mount_opt, ERRORS_PANIC); |
| 1586 | else if (le16_to_cpu(sbi->s_es->s_errors) == EXT3_ERRORS_RO) | 1586 | else if (le16_to_cpu(sbi->s_es->s_errors) == EXT3_ERRORS_CONTINUE) |
| 1587 | set_opt(sbi->s_mount_opt, ERRORS_RO); | ||
| 1588 | else | ||
| 1589 | set_opt(sbi->s_mount_opt, ERRORS_CONT); | 1587 | set_opt(sbi->s_mount_opt, ERRORS_CONT); |
| 1588 | else | ||
| 1589 | set_opt(sbi->s_mount_opt, ERRORS_RO); | ||
| 1590 | 1590 | ||
| 1591 | sbi->s_resuid = le16_to_cpu(es->s_def_resuid); | 1591 | sbi->s_resuid = le16_to_cpu(es->s_def_resuid); |
| 1592 | sbi->s_resgid = le16_to_cpu(es->s_def_resgid); | 1592 | sbi->s_resgid = le16_to_cpu(es->s_def_resgid); |
