[PATCH 3/3] bcachefs: check_key_has_inode() reconstructs more aggressively

[Kent Overstreet]

For regular files: reconstruct if more than three extents are found
found

For directories: reconstruct if a single dirent is found.

Signed-off-by: Kent Overstreet <kent.overstr...@linux.dev>
---
 fs/bcachefs/fsck.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/fs/bcachefs/fsck.c b/fs/bcachefs/fsck.c
index a94dea16e4cf..52f4dc7ba477 100644
--- a/fs/bcachefs/fsck.c
+++ b/fs/bcachefs/fsck.c
@@ -1500,6 +1500,10 @@ static int check_key_has_inode(struct btree_trans *trans,
                                         SPOS(k.k->p.inode, 0, k.k->p.snapshot),
                                         POS(k.k->p.inode, U64_MAX),
                                         0, k2, ret) {
+               if (k.k->type == KEY_TYPE_error ||
+                   k.k->type == KEY_TYPE_hash_whiteout)
+                       continue;
+
                nr_keys++;
                if (nr_keys <= 10) {
                        bch2_bkey_val_to_text(&buf, c, k2);
@@ -1512,9 +1516,11 @@ static int check_key_has_inode(struct btree_trans *trans,
        if (ret)
                goto err;
 
+       unsigned reconstruct_limit = iter->btree_id == BTREE_ID_extents ? 3 : 0;
+
        if (nr_keys > 100)
                prt_printf(&buf, "found > %u keys for this missing inode\n", 
nr_keys);
-       else if (nr_keys > 10)
+       else if (nr_keys > reconstruct_limit)
                prt_printf(&buf, "found %u keys for this missing inode\n", 
nr_keys);
 
        if (!have_inode) {
-- 
2.50.0