[PATCH 01/34] bcachefs: BCH_ERR_btree_node_read_error_cached

[Kent Overstreet]

Signed-off-by: Kent Overstreet <kent.overstr...@linux.dev>
---
 fs/bcachefs/btree_cache.c | 6 +++---
 fs/bcachefs/errcode.h     | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fs/bcachefs/btree_cache.c b/fs/bcachefs/btree_cache.c
index a0a406b0c7bc..36dfa6a48aa6 100644
--- a/fs/bcachefs/btree_cache.c
+++ b/fs/bcachefs/btree_cache.c
@@ -1131,7 +1131,7 @@ static struct btree *__bch2_btree_node_get(struct 
btree_trans *trans, struct btr
 
        if (unlikely(btree_node_read_error(b))) {
                six_unlock_type(&b->c.lock, lock_type);
-               return ERR_PTR(-BCH_ERR_btree_node_read_error);
+               return ERR_PTR(-BCH_ERR_btree_node_read_err_cached);
        }
 
        EBUG_ON(b->c.btree_id != path->btree_id);
@@ -1221,7 +1221,7 @@ struct btree *bch2_btree_node_get(struct btree_trans 
*trans, struct btree_path *
 
        if (unlikely(btree_node_read_error(b))) {
                six_unlock_type(&b->c.lock, lock_type);
-               return ERR_PTR(-BCH_ERR_btree_node_read_error);
+               return ERR_PTR(-BCH_ERR_btree_node_read_err_cached);
        }
 
        EBUG_ON(b->c.btree_id != path->btree_id);
@@ -1303,7 +1303,7 @@ struct btree *bch2_btree_node_get_noiter(struct 
btree_trans *trans,
 
        if (unlikely(btree_node_read_error(b))) {
                six_unlock_read(&b->c.lock);
-               b = ERR_PTR(-BCH_ERR_btree_node_read_error);
+               b = ERR_PTR(-BCH_ERR_btree_node_read_err_cached);
                goto out;
        }
 
diff --git a/fs/bcachefs/errcode.h b/fs/bcachefs/errcode.h
index 2dda7f962e5b..131b9bef21a0 100644
--- a/fs/bcachefs/errcode.h
+++ b/fs/bcachefs/errcode.h
@@ -242,6 +242,7 @@
        x(BCH_ERR_invalid,              invalid_bkey)                           
\
        x(BCH_ERR_operation_blocked,    nocow_lock_blocked)                     
\
        x(EIO,                          btree_node_read_err)                    
\
+       x(BCH_ERR_btree_node_read_err,  btree_node_read_err_cached)             
\
        x(EIO,                          sb_not_downgraded)                      
\
        x(EIO,                          btree_node_write_all_failed)            
\
        x(EIO,                          btree_node_read_error)                  
\
-- 
2.45.2