From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Thu, 28 Mar 2019 07:28:59 +0000 (-0400)
Subject: bcachefs: Handle fsck errors at runtime better
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6543f5620d81cfa7b52d00c7ade0f037beb7a71e;p=linux.git

bcachefs: Handle fsck errors at runtime better

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/error.c b/fs/bcachefs/error.c
index 08e79166dae4c..f0a44101b7e7a 100644
--- a/fs/bcachefs/error.c
+++ b/fs/bcachefs/error.c
@@ -67,10 +67,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)