From 209695dedf49425ad9e91ba2b2239c3a040ea159 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sun, 4 Apr 2021 22:12:56 -0400 Subject: Update bcachefs sources to f26267fc82 bcachefs: kill bset_tree->max_key --- libbcachefs/btree_locking.h | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'libbcachefs/btree_locking.h') diff --git a/libbcachefs/btree_locking.h b/libbcachefs/btree_locking.h index 38323e32..7532bcde 100644 --- a/libbcachefs/btree_locking.h +++ b/libbcachefs/btree_locking.h @@ -95,7 +95,7 @@ btree_lock_want(struct btree_iter *iter, int level) return BTREE_NODE_UNLOCKED; } -static inline void __btree_node_unlock(struct btree_iter *iter, unsigned level) +static inline void btree_node_unlock(struct btree_iter *iter, unsigned level) { int lock_type = btree_node_locked_type(iter, level); @@ -106,13 +106,6 @@ static inline void __btree_node_unlock(struct btree_iter *iter, unsigned level) mark_btree_node_unlocked(iter, level); } -static inline void btree_node_unlock(struct btree_iter *iter, unsigned level) -{ - EBUG_ON(!level && iter->trans->nounlock); - - __btree_node_unlock(iter, level); -} - static inline void __bch2_btree_iter_unlock(struct btree_iter *iter) { btree_iter_set_dirty(iter, BTREE_ITER_NEED_RELOCK); @@ -187,27 +180,14 @@ static inline bool btree_node_lock(struct btree *b, unsigned long ip) { struct btree_trans *trans = iter->trans; - bool ret; EBUG_ON(level >= BTREE_MAX_DEPTH); EBUG_ON(!(trans->iters_linked & (1ULL << iter->idx))); -#ifdef CONFIG_BCACHEFS_DEBUG - trans->locking = b; - trans->locking_iter_idx = iter->idx; - trans->locking_pos = pos; - trans->locking_btree_id = iter->btree_id; - trans->locking_level = level; -#endif - ret = likely(six_trylock_type(&b->c.lock, type)) || + return likely(six_trylock_type(&b->c.lock, type)) || btree_node_lock_increment(trans, b, level, type) || __bch2_btree_node_lock(b, pos, level, iter, type, should_sleep_fn, p, ip); - -#ifdef CONFIG_BCACHEFS_DEBUG - trans->locking = NULL; -#endif - return ret; } bool __bch2_btree_node_relock(struct btree_iter *, unsigned); -- cgit v1.2.3