Commit 0b6ec0c5 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: Fix assertion pop in topology repair 



Fixes: baefd3f8 ("bcachefs: btree_cache.freeable list fixes")
Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent bcf77a05

fs/bcachefs/btree_gc.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static int set_node_max(struct bch_fs *c, struct btree *b, struct bpos new_max) 
	bch2_btree_node_drop_keys_outside_node(b);



	mutex_lock(&c->btree_cache.lock);

	bch2_btree_node_hash_remove(&c->btree_cache, b);

	__bch2_btree_node_hash_remove(&c->btree_cache, b);



	bkey_copy(&b->key, &new->k_i);

	ret = __bch2_btree_node_hash_insert(&c->btree_cache, b);

fs/bcachefs/btree_update_interior.c

+2 −1
Original line number Diff line number Diff line
@@ -2398,7 +2398,8 @@ static int __bch2_btree_node_update_key(struct btree_trans *trans, 
	if (new_hash) {

		mutex_lock(&c->btree_cache.lock);

		bch2_btree_node_hash_remove(&c->btree_cache, new_hash);

		bch2_btree_node_hash_remove(&c->btree_cache, b);



		__bch2_btree_node_hash_remove(&c->btree_cache, b);



		bkey_copy(&b->key, new_key);

		ret = __bch2_btree_node_hash_insert(&c->btree_cache, b);