63 lines
1.8 KiB
Diff
63 lines
1.8 KiB
Diff
From 8ea098f248cceb4838f41d7a01389eb26c8109e4 Mon Sep 17 00:00:00 2001
|
|
From: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Date: Wed, 4 Dec 2024 19:41:38 -0500
|
|
Subject: [PATCH 170/233] bcachefs: Call bch2_btree_lost_data() on btree read
|
|
error
|
|
Content-Type: text/plain; charset="utf-8"
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
|
|
---
|
|
fs/bcachefs/btree_gc.c | 13 ++++++-------
|
|
1 file changed, 6 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c
|
|
index e59924cfe2bc..24f2f3bdf704 100644
|
|
--- a/fs/bcachefs/btree_gc.c
|
|
+++ b/fs/bcachefs/btree_gc.c
|
|
@@ -29,6 +29,7 @@
|
|
#include "move.h"
|
|
#include "recovery_passes.h"
|
|
#include "reflink.h"
|
|
+#include "recovery.h"
|
|
#include "replicas.h"
|
|
#include "super-io.h"
|
|
#include "trace.h"
|
|
@@ -359,11 +360,9 @@ static int bch2_btree_repair_topology_recurse(struct btree_trans *trans, struct
|
|
if (ret)
|
|
break;
|
|
|
|
- if (!btree_id_is_alloc(b->c.btree_id)) {
|
|
- ret = bch2_run_explicit_recovery_pass(c, BCH_RECOVERY_PASS_scan_for_btree_nodes);
|
|
- if (ret)
|
|
- break;
|
|
- }
|
|
+ ret = bch2_btree_lost_data(c, b->c.btree_id);
|
|
+ if (ret)
|
|
+ break;
|
|
continue;
|
|
}
|
|
|
|
@@ -525,7 +524,7 @@ int bch2_check_topology(struct bch_fs *c)
|
|
bch2_btree_id_to_text(&buf, i);
|
|
|
|
if (r->error) {
|
|
- ret = bch2_run_explicit_recovery_pass(c, BCH_RECOVERY_PASS_scan_for_btree_nodes);
|
|
+ ret = bch2_btree_lost_data(c, i);
|
|
if (ret)
|
|
break;
|
|
reconstruct_root:
|
|
@@ -741,7 +740,7 @@ static int bch2_gc_btrees(struct bch_fs *c)
|
|
(printbuf_reset(&buf),
|
|
bch2_btree_id_to_text(&buf, btree),
|
|
buf.buf)))
|
|
- ret = bch2_run_explicit_recovery_pass(c, BCH_RECOVERY_PASS_check_topology);
|
|
+ ret = bch2_btree_lost_data(c, btree);
|
|
}
|
|
fsck_err:
|
|
printbuf_exit(&buf);
|
|
--
|
|
2.45.2
|
|
|