Commit bf5f6a68 authored by Kent Overstreet's avatar Kent Overstreet

bcachefs: __BTREE_ITER_ALL_SNAPSHOTS -> BTREE_ITER_SNAPSHOT_FIELD

Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent c281db0f
...@@ -258,7 +258,7 @@ static void bch2_btree_iter_verify(struct btree_iter *iter) ...@@ -258,7 +258,7 @@ static void bch2_btree_iter_verify(struct btree_iter *iter)
BUG_ON((iter->flags & BTREE_ITER_IS_EXTENTS) && BUG_ON((iter->flags & BTREE_ITER_IS_EXTENTS) &&
(iter->flags & BTREE_ITER_ALL_SNAPSHOTS)); (iter->flags & BTREE_ITER_ALL_SNAPSHOTS));
BUG_ON(!(iter->flags & __BTREE_ITER_ALL_SNAPSHOTS) && BUG_ON(!(iter->flags & BTREE_ITER_SNAPSHOT_FIELD) &&
(iter->flags & BTREE_ITER_ALL_SNAPSHOTS) && (iter->flags & BTREE_ITER_ALL_SNAPSHOTS) &&
!btree_type_has_snapshot_field(iter->btree_id)); !btree_type_has_snapshot_field(iter->btree_id));
...@@ -2809,7 +2809,7 @@ void bch2_trans_node_iter_init(struct btree_trans *trans, ...@@ -2809,7 +2809,7 @@ void bch2_trans_node_iter_init(struct btree_trans *trans,
unsigned flags) unsigned flags)
{ {
flags |= BTREE_ITER_NOT_EXTENTS; flags |= BTREE_ITER_NOT_EXTENTS;
flags |= __BTREE_ITER_ALL_SNAPSHOTS; flags |= BTREE_ITER_SNAPSHOT_FIELD;
flags |= BTREE_ITER_ALL_SNAPSHOTS; flags |= BTREE_ITER_ALL_SNAPSHOTS;
bch2_trans_iter_init_common(trans, iter, btree_id, pos, locks_want, depth, bch2_trans_iter_init_common(trans, iter, btree_id, pos, locks_want, depth,
......
...@@ -420,7 +420,7 @@ static inline unsigned __bch2_btree_iter_flags(struct btree_trans *trans, ...@@ -420,7 +420,7 @@ static inline unsigned __bch2_btree_iter_flags(struct btree_trans *trans,
btree_id_is_extents(btree_id)) btree_id_is_extents(btree_id))
flags |= BTREE_ITER_IS_EXTENTS; flags |= BTREE_ITER_IS_EXTENTS;
if (!(flags & __BTREE_ITER_ALL_SNAPSHOTS) && if (!(flags & BTREE_ITER_SNAPSHOT_FIELD) &&
!btree_type_has_snapshot_field(btree_id)) !btree_type_has_snapshot_field(btree_id))
flags &= ~BTREE_ITER_ALL_SNAPSHOTS; flags &= ~BTREE_ITER_ALL_SNAPSHOTS;
......
...@@ -210,7 +210,7 @@ static const __maybe_unused u16 BTREE_ITER_CACHED = 1 << 5; ...@@ -210,7 +210,7 @@ static const __maybe_unused u16 BTREE_ITER_CACHED = 1 << 5;
static const __maybe_unused u16 BTREE_ITER_WITH_KEY_CACHE = 1 << 6; static const __maybe_unused u16 BTREE_ITER_WITH_KEY_CACHE = 1 << 6;
static const __maybe_unused u16 BTREE_ITER_WITH_UPDATES = 1 << 7; static const __maybe_unused u16 BTREE_ITER_WITH_UPDATES = 1 << 7;
static const __maybe_unused u16 BTREE_ITER_WITH_JOURNAL = 1 << 8; static const __maybe_unused u16 BTREE_ITER_WITH_JOURNAL = 1 << 8;
static const __maybe_unused u16 __BTREE_ITER_ALL_SNAPSHOTS = 1 << 9; static const __maybe_unused u16 BTREE_ITER_SNAPSHOT_FIELD = 1 << 9;
static const __maybe_unused u16 BTREE_ITER_ALL_SNAPSHOTS = 1 << 10; static const __maybe_unused u16 BTREE_ITER_ALL_SNAPSHOTS = 1 << 10;
static const __maybe_unused u16 BTREE_ITER_FILTER_SNAPSHOTS = 1 << 11; static const __maybe_unused u16 BTREE_ITER_FILTER_SNAPSHOTS = 1 << 11;
static const __maybe_unused u16 BTREE_ITER_NOPRESERVE = 1 << 12; static const __maybe_unused u16 BTREE_ITER_NOPRESERVE = 1 << 12;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment