gentoo-overlay/sys-kernel/hardened-kernel/files/linux-6.12/0229-bcachefs-Drop-redundan...

44 lines
1.3 KiB
Diff

From 83fa58a3704b538c240b1ae6e8e91ff08eb88269 Mon Sep 17 00:00:00 2001
From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Sun, 15 Dec 2024 02:03:11 -0500
Subject: [PATCH 229/233] bcachefs: Drop redundant "read error" call from
btree_gc
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
The btree node read error path already calls topology error, so this is
entirely redundant, and we're not specific enough about our error codes
- this was triggering for bucket_ref_update() errors.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
---
fs/bcachefs/btree_gc.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c
index 5aa11ca08c94..721dca551720 100644
--- a/fs/bcachefs/btree_gc.c
+++ b/fs/bcachefs/btree_gc.c
@@ -733,16 +733,8 @@ static int bch2_gc_btrees(struct bch_fs *c)
continue;
ret = bch2_gc_btree(trans, btree, true);
-
- if (mustfix_fsck_err_on(bch2_err_matches(ret, EIO),
- trans, btree_node_read_error,
- "btree node read error for %s",
- (printbuf_reset(&buf),
- bch2_btree_id_to_text(&buf, btree),
- buf.buf)))
- ret = bch2_btree_lost_data(c, btree);
}
-fsck_err:
+
printbuf_exit(&buf);
bch2_trans_put(trans);
bch_err_fn(c, ret);
--
2.45.2