diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-06-22 20:45:30 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-06-23 15:53:37 -0400 |
| commit | 55142cd0b5ef2a2150d4708dad0c3fd54a3ffd39 (patch) | |
| tree | 81397095a23b5432d2ae14ca40d72fb37189bce5 /libbcachefs/btree_iter.h | |
| parent | fe1bb39aa52d9140981ba1e96f3c95ddf14006ce (diff) | |
Update bcachefs sources to ca3cfad39f fixup! bcachefs: Improve iter->should_be_locked
Diffstat (limited to 'libbcachefs/btree_iter.h')
| -rw-r--r-- | libbcachefs/btree_iter.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libbcachefs/btree_iter.h b/libbcachefs/btree_iter.h index ba98cfea..6efea281 100644 --- a/libbcachefs/btree_iter.h +++ b/libbcachefs/btree_iter.h @@ -160,8 +160,6 @@ struct bkey_s_c bch2_btree_iter_peek_slot(struct btree_iter *); struct bkey_s_c bch2_btree_iter_next_slot(struct btree_iter *); struct bkey_s_c bch2_btree_iter_prev_slot(struct btree_iter *); -struct bkey_s_c bch2_btree_iter_peek_cached(struct btree_iter *); - bool bch2_btree_iter_advance(struct btree_iter *); bool bch2_btree_iter_rewind(struct btree_iter *); @@ -178,6 +176,12 @@ static inline void bch2_btree_iter_set_pos(struct btree_iter *iter, struct bpos iter->should_be_locked = false; } +static inline void bch2_btree_iter_set_pos_to_extent_start(struct btree_iter *iter) +{ + BUG_ON(!(iter->flags & BTREE_ITER_IS_EXTENTS)); + iter->pos = bkey_start_pos(&iter->k); +} + static inline struct btree_iter *btree_iter_child(struct btree_iter *iter) { return iter->child_idx == U8_MAX ? NULL @@ -224,12 +228,9 @@ static inline int bch2_trans_cond_resched(struct btree_trans *trans) static inline struct bkey_s_c __bch2_btree_iter_peek(struct btree_iter *iter, unsigned flags) { - if ((flags & BTREE_ITER_TYPE) == BTREE_ITER_CACHED) - return bch2_btree_iter_peek_cached(iter); - else - return flags & BTREE_ITER_SLOTS - ? bch2_btree_iter_peek_slot(iter) - : bch2_btree_iter_peek(iter); + return flags & BTREE_ITER_SLOTS + ? bch2_btree_iter_peek_slot(iter) + : bch2_btree_iter_peek(iter); } static inline struct bkey_s_c __bch2_btree_iter_next(struct btree_iter *iter, |