diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2012-03-03 17:56:23 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2012-03-03 17:56:23 -0500 |
| commit | 39ef17f1b0613b46c6973596525c2bc816d90b5b (patch) | |
| tree | c07e2dcd3cd21d7d5db0203263e5efae63a02729 /fs/ext4/super.c | |
| parent | c64db50e76c4bf68c0a84379d7bd70daada531b4 (diff) | |
ext4: simplify handling of the errors=* mount options
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/super.c')
| -rw-r--r-- | fs/ext4/super.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 6b27bc6eba40..93cca1fa3903 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
| @@ -1565,18 +1565,15 @@ static int parse_options(char *options, struct super_block *sb, | |||
| 1565 | /* *sb_block = match_int(&args[0]); */ | 1565 | /* *sb_block = match_int(&args[0]); */ |
| 1566 | break; | 1566 | break; |
| 1567 | case Opt_err_panic: | 1567 | case Opt_err_panic: |
| 1568 | clear_opt(sb, ERRORS_CONT); | 1568 | clear_opt(sb, ERRORS_MASK); |
| 1569 | clear_opt(sb, ERRORS_RO); | ||
| 1570 | set_opt(sb, ERRORS_PANIC); | 1569 | set_opt(sb, ERRORS_PANIC); |
| 1571 | break; | 1570 | break; |
| 1572 | case Opt_err_ro: | 1571 | case Opt_err_ro: |
| 1573 | clear_opt(sb, ERRORS_CONT); | 1572 | clear_opt(sb, ERRORS_MASK); |
| 1574 | clear_opt(sb, ERRORS_PANIC); | ||
| 1575 | set_opt(sb, ERRORS_RO); | 1573 | set_opt(sb, ERRORS_RO); |
| 1576 | break; | 1574 | break; |
| 1577 | case Opt_err_cont: | 1575 | case Opt_err_cont: |
| 1578 | clear_opt(sb, ERRORS_RO); | 1576 | clear_opt(sb, ERRORS_MASK); |
| 1579 | clear_opt(sb, ERRORS_PANIC); | ||
| 1580 | set_opt(sb, ERRORS_CONT); | 1577 | set_opt(sb, ERRORS_CONT); |
| 1581 | break; | 1578 | break; |
| 1582 | case Opt_nouid32: | 1579 | case Opt_nouid32: |