diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-03-22 15:50:47 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-03-24 19:26:47 -0400 |
| commit | 9f69a652dc33611db3c4a3d4ebda00a3ff8b3ca6 (patch) | |
| tree | 16e59039f35d7df4d888793464af1936b04f27d8 /libbcachefs/btree_iter.h | |
| parent | 1f0d52aa0677715f5bf5371708279904f5e70d24 (diff) | |
Update bcachefs sources to c7defb5793 bcachefs: Split btree_iter_traverse and bch2_btree_iter_traverse()
Diffstat (limited to 'libbcachefs/btree_iter.h')
| -rw-r--r-- | libbcachefs/btree_iter.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/libbcachefs/btree_iter.h b/libbcachefs/btree_iter.h index c839bfe6..8768f4cb 100644 --- a/libbcachefs/btree_iter.h +++ b/libbcachefs/btree_iter.h @@ -145,15 +145,7 @@ void bch2_btree_iter_node_drop(struct btree_iter *, struct btree *); void bch2_btree_iter_reinit_node(struct btree_iter *, struct btree *); -int __must_check __bch2_btree_iter_traverse(struct btree_iter *); - -static inline int __must_check -bch2_btree_iter_traverse(struct btree_iter *iter) -{ - return iter->uptodate >= BTREE_ITER_NEED_RELOCK - ? __bch2_btree_iter_traverse(iter) - : 0; -} +int __must_check bch2_btree_iter_traverse(struct btree_iter *); int bch2_btree_iter_traverse_all(struct btree_trans *); @@ -175,9 +167,14 @@ 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_pos(struct btree_iter *); -bool bch2_btree_iter_rewind_pos(struct btree_iter *); -void bch2_btree_iter_set_pos(struct btree_iter *, struct bpos); +bool bch2_btree_iter_advance(struct btree_iter *); +bool bch2_btree_iter_rewind(struct btree_iter *); + +static inline void bch2_btree_iter_set_pos(struct btree_iter *iter, struct bpos new_pos) +{ + bkey_init(&iter->k); + iter->k.p = iter->pos = new_pos; +} /* Sort order for locking btree iterators: */ static inline int btree_iter_lock_cmp(const struct btree_iter *l, |