Commit 375d21b7 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: BCH_ERR_btree_node_read_error_cached 



Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 0eaac0b4

fs/bcachefs/btree_cache.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

	}

fs/bcachefs/errcode.h

+1 −0
Original line number Diff line number Diff line
@@ -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)			\