diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-03-28 03:28:59 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2019-03-28 03:29:28 -0400 |
| commit | 0a61e69e0b31992c0339932a9d70944ecab623b8 (patch) | |
| tree | 184d19f529e6480eba2e9f97d787e387db281c43 | |
| parent | 1c782ec7cee6c3c2759ac811d6827753feb83f3c (diff) | |
bcachefs: Handle fsck errors at runtime better
| -rw-r--r-- | fs/bcachefs/error.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/fs/bcachefs/error.c b/fs/bcachefs/error.c index 9505b6e6d375..e3747781c4b9 100644 --- a/fs/bcachefs/error.c +++ b/fs/bcachefs/error.c @@ -66,10 +66,20 @@ enum fsck_err_ret bch2_fsck_err(struct bch_fs *c, unsigned flags, bool fix = false, print = true, suppressing = false; char _buf[sizeof(s->buf)], *buf = _buf; - mutex_lock(&c->fsck_error_lock); + if (test_bit(BCH_FS_FSCK_DONE, &c->flags)) { + va_start(args, fmt); + vprintk(fmt, args); + va_end(args); - if (test_bit(BCH_FS_FSCK_DONE, &c->flags)) - goto print; + if (c->opts.errors == BCH_ON_ERROR_CONTINUE && + flags & FSCK_CAN_FIX) + return FSCK_ERR_FIX; + + bch2_inconsistent_error(c); + return FSCK_ERR_EXIT; + } + + mutex_lock(&c->fsck_error_lock); list_for_each_entry(s, &c->fsck_errors, list) if (s->fmt == fmt) |