From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Tue, 26 Sep 2023 21:21:21 +0000 (-0400)
Subject: bcachefs: Make btree root read errors recoverable
X-Git-Tag: v6.7-rc1~201^2~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7dcf62c06d11195e8caecd7b2236aa5b07e3ef8c;p=thirdparty%2Fkernel%2Flinux.git

bcachefs: Make btree root read errors recoverable

The entire btree will be lost, but that is better than the entire
filesystem not being recoverable.

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

diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index 1dceb7eeb2056..9dbaf080dcdd4 100644
--- a/fs/bcachefs/recovery.c
+++ b/fs/bcachefs/recovery.c
@@ -374,13 +374,12 @@ static int read_btree_roots(struct bch_fs *c)
 
 		ret = bch2_btree_root_read(c, i, &r->key, r->level);
 		if (ret) {
-			__fsck_err(c,
-				   btree_id_is_alloc(i)
-				   ? FSCK_CAN_IGNORE : 0,
-				   "error reading btree root %s",
-				   bch2_btree_ids[i]);
+			fsck_err(c,
+				 "error reading btree root %s",
+				 bch2_btree_ids[i]);
 			if (btree_id_is_alloc(i))
 				c->sb.compat &= ~(1ULL << BCH_COMPAT_alloc_info);
+			ret = 0;
 		}
 	}