bcachefs: Remove redundant calls to btree_lost_data()
authorKent Overstreet <kent.overstreet@linux.dev>
Thu, 24 Apr 2025 13:13:28 +0000 (09:13 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Thu, 22 May 2025 00:14:33 +0000 (20:14 -0400)
The btree node read path calls this before returning the read error.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/btree_gc.c
fs/bcachefs/recovery.c

index fecf88079127fbe77e5699b6c314e9e9d179287b..92ae31737a24500553b457ed0a1507e9cecc7d89 100644 (file)
@@ -378,10 +378,6 @@ again:
                                                      b->c.level, cur_k.k->k.p);
                        if (ret)
                                break;
-
-                       ret = bch2_btree_lost_data(c, b->c.btree_id);
-                       if (ret)
-                               break;
                        continue;
                }
 
@@ -543,9 +539,6 @@ int bch2_check_topology(struct bch_fs *c)
                bch2_btree_id_to_text(&buf, i);
 
                if (r->error) {
-                       ret = bch2_btree_lost_data(c, i);
-                       if (ret)
-                               break;
 reconstruct_root:
                        bch_info(c, "btree root %s unreadable, must recover from scan", buf.buf);
 
index 8f45d9e3a47e52481c05be329f6c498c1b732b5b..a0b42cca86fb260476e479b67ea798d9dbafa300 100644 (file)
@@ -587,9 +587,6 @@ static int read_btree_roots(struct bch_fs *c)
                                        buf.buf, bch2_err_str(ret))) {
                        if (btree_id_is_alloc(i))
                                r->error = 0;
-
-                       ret = bch2_btree_lost_data(c, i);
-                       BUG_ON(ret);
                }
        }