Commit d4d24a65 authored by Kent Overstreet's avatar Kent Overstreet Committed by Kent Overstreet
Browse files

bcachefs: Delay setting path->should_be_locked 



Signed-off-by: default avatarKent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent cc23255e

fs/bcachefs/btree_iter.c

+16 −7
Original line number Diff line number Diff line
@@ -427,8 +427,8 @@ bool bch2_btree_path_relock_intent(struct btree_trans *trans, 
	return true;

}



__flatten

static bool bch2_btree_path_relock(struct btree_trans *trans,

noinline __flatten

static bool __bch2_btree_path_relock(struct btree_trans *trans,

			struct btree_path *path, unsigned long trace_ip)

{

	bool ret = btree_path_get_locks(trans, path, false);
@@ -441,6 +441,14 @@ static bool bch2_btree_path_relock(struct btree_trans *trans, 
	return ret;

}



static inline bool bch2_btree_path_relock(struct btree_trans *trans,

			struct btree_path *path, unsigned long trace_ip)

{

	return btree_node_locked(path, path->level)

		? true

		: __bch2_btree_path_relock(trans, path, trace_ip);

}



bool __bch2_btree_path_upgrade(struct btree_trans *trans,

			       struct btree_path *path,

			       unsigned new_locks_want)
@@ -2388,9 +2396,6 @@ struct bkey_s_c bch2_btree_iter_peek(struct btree_iter *iter) 
			iter->update_path = bch2_btree_path_set_pos(trans,

						iter->update_path, pos,

						iter->flags & BTREE_ITER_INTENT);



			BUG_ON(!(iter->update_path->nodes_locked & 1));

			iter->update_path->should_be_locked = true;

		}



		/*
@@ -2428,9 +2433,13 @@ struct bkey_s_c bch2_btree_iter_peek(struct btree_iter *iter) 
	BUG_ON(!iter->path->nodes_locked);

out:

	if (iter->update_path) {

		if (unlikely(!bch2_btree_path_relock(trans, iter->update_path, _THIS_IP_))) {

			k = bkey_s_c_err(-EINTR);

		} else {

			BUG_ON(!(iter->update_path->nodes_locked & 1));

			iter->update_path->should_be_locked = true;

		}

	}

	iter->path->should_be_locked = true;



	if (!(iter->flags & BTREE_ITER_ALL_SNAPSHOTS))