Commit 8cfdc6ce authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: bch2_trans_node_drop() 



Factor out a small common helper.

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

fs/bcachefs/btree_iter.c

+13 −0
Original line number Diff line number Diff line
@@ -699,6 +699,19 @@ void bch2_trans_node_add(struct btree_trans *trans, 
	bch2_trans_revalidate_updates_in_node(trans, b);

}



void bch2_trans_node_drop(struct btree_trans *trans,

			  struct btree *b)

{

	struct btree_path *path;

	unsigned i, level = b->c.level;



	trans_for_each_path(trans, path, i)

		if (path->l[level].b == b) {

			btree_node_unlock(trans, path, level);

			path->l[level].b = ERR_PTR(-BCH_ERR_no_btree_node_init);

		}

}



/*

 * A btree node has been modified in such a way as to invalidate iterators - fix

 * them:

fs/bcachefs/btree_iter.h

+1 −0
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ static inline void bch2_btree_path_downgrade(struct btree_trans *trans, 
void bch2_trans_downgrade(struct btree_trans *);



void bch2_trans_node_add(struct btree_trans *trans, struct btree_path *, struct btree *);

void bch2_trans_node_drop(struct btree_trans *trans, struct btree *);

void bch2_trans_node_reinit_iter(struct btree_trans *, struct btree *);



int __must_check __bch2_btree_iter_traverse(struct btree_iter *iter);

fs/bcachefs/btree_update_interior.c

+3 −14
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ static void bch2_btree_node_free_inmem(struct btree_trans *trans, 
				       struct btree *b)

{

	struct bch_fs *c = trans->c;

	unsigned i, level = b->c.level;



	bch2_btree_node_lock_write_nofail(trans, path, &b->c);
@@ -249,13 +248,9 @@ static void bch2_btree_node_free_inmem(struct btree_trans *trans, 
	mutex_unlock(&c->btree_cache.lock);



	six_unlock_write(&b->c.lock);

	mark_btree_node_locked_noreset(path, level, BTREE_NODE_INTENT_LOCKED);

	mark_btree_node_locked_noreset(path, b->c.level, BTREE_NODE_INTENT_LOCKED);



	trans_for_each_path(trans, path, i)

		if (path->l[level].b == b) {

			btree_node_unlock(trans, path, level);

			path->l[level].b = ERR_PTR(-BCH_ERR_no_btree_node_init);

		}

	bch2_trans_node_drop(trans, b);

}



static void bch2_btree_node_free_never_used(struct btree_update *as,
@@ -264,8 +259,6 @@ static void bch2_btree_node_free_never_used(struct btree_update *as, 
{

	struct bch_fs *c = as->c;

	struct prealloc_nodes *p = &as->prealloc_nodes[b->c.lock.readers != NULL];

	struct btree_path *path;

	unsigned i, level = b->c.level;



	BUG_ON(!list_empty(&b->write_blocked));

	BUG_ON(b->will_make_reachable != (1UL|(unsigned long) as));
@@ -287,11 +280,7 @@ static void bch2_btree_node_free_never_used(struct btree_update *as, 


	six_unlock_intent(&b->c.lock);



	trans_for_each_path(trans, path, i)

		if (path->l[level].b == b) {

			btree_node_unlock(trans, path, level);

			path->l[level].b = ERR_PTR(-BCH_ERR_no_btree_node_init);

		}

	bch2_trans_node_drop(trans, b);

}



static struct btree *__bch2_btree_node_alloc(struct btree_trans *trans,