diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-03-29 14:36:06 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2019-03-29 17:35:44 -0400 |
| commit | be02db130bf75c28e402d890f4d994f3608707ff (patch) | |
| tree | b3a4abb55445f6a9389b5f475c661db89cb9c952 /libbcachefs/error.c | |
| parent | 133dfeb64843af65a018be770eb005363ca59bd9 (diff) | |
Update bcachefs sources to 1712318522 bcachefs: allow journal reply on ro mount
Diffstat (limited to 'libbcachefs/error.c')
| -rw-r--r-- | libbcachefs/error.c | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/libbcachefs/error.c b/libbcachefs/error.c index e3747781..afffbfb3 100644 --- a/libbcachefs/error.c +++ b/libbcachefs/error.c @@ -71,12 +71,9 @@ enum fsck_err_ret bch2_fsck_err(struct bch_fs *c, unsigned flags, vprintk(fmt, args); va_end(args); - if (c->opts.errors == BCH_ON_ERROR_CONTINUE && - flags & FSCK_CAN_FIX) - return FSCK_ERR_FIX; - - bch2_inconsistent_error(c); - return FSCK_ERR_EXIT; + return bch2_inconsistent_error(c) + ? FSCK_ERR_EXIT + : FSCK_ERR_FIX; } mutex_lock(&c->fsck_error_lock); @@ -109,11 +106,7 @@ print: if (c->opts.fix_errors == FSCK_OPT_EXIT) { bch_err(c, "%s, exiting", buf); - mutex_unlock(&c->fsck_error_lock); - return FSCK_ERR_EXIT; - } - - if (flags & FSCK_CAN_FIX) { + } else if (flags & FSCK_CAN_FIX) { if (c->opts.fix_errors == FSCK_OPT_ASK) { printk(KERN_ERR "%s: fix?", buf); fix = ask_yn(); @@ -141,13 +134,16 @@ print: mutex_unlock(&c->fsck_error_lock); - set_bit(fix - ? BCH_FS_FSCK_FIXED_ERRORS - : BCH_FS_FSCK_UNFIXED_ERRORS, &c->flags); - - return fix ? FSCK_ERR_FIX - : flags & FSCK_CAN_IGNORE ? FSCK_ERR_IGNORE - : FSCK_ERR_EXIT; + if (fix) { + set_bit(BCH_FS_ERRORS_FIXED, &c->flags); + return FSCK_ERR_FIX; + } else { + set_bit(BCH_FS_ERROR, &c->flags); + return c->opts.fix_errors == FSCK_OPT_EXIT || + !(flags & FSCK_CAN_IGNORE) + ? FSCK_ERR_EXIT + : FSCK_ERR_IGNORE; + } } void bch2_flush_fsck_errs(struct bch_fs *c) |