diff options
| author |   Kent Overstreet <kent.overstreet@linux.dev> | 2024-10-04 21:40:13 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-10-06 03:03:45 -0400 |
| commit | 12f286085bf592346cffa93d8e21b0cc2c01f9fe (patch) | |
| tree | 9a200f076ed6d8e7c88ac26a4a4ff91f78f8af3f | |
| parent | bcachefs: reattach_inode() now correctly handles interior snapshot nodes (diff) | |
| download | wireguard-linux-12f286085bf592346cffa93d8e21b0cc2c01f9fe.tar.xz wireguard-linux-12f286085bf592346cffa93d8e21b0cc2c01f9fe.zip | |
bcachefs: btree_iter_peek_upto() now handles BTREE_ITER_all_snapshots
end_pos now compares against snapshot ID when required
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/btree_iter.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index bfe9f0c1e1be..0883cf6e1a3e 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -2381,9 +2381,9 @@ struct bkey_s_c bch2_btree_iter_peek_upto(struct btree_iter *iter, struct bpos e else iter_pos = bkey_max(iter->pos, bkey_start_pos(k.k)); - if (unlikely(!(iter->flags & BTREE_ITER_is_extents) - ? bkey_gt(iter_pos, end) - : bkey_ge(iter_pos, end))) + if (unlikely(iter->flags & BTREE_ITER_all_snapshots ? bpos_gt(iter_pos, end) : + iter->flags & BTREE_ITER_is_extents ? bkey_ge(iter_pos, end) : + bkey_gt(iter_pos, end))) goto end; break; |