diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-08-21 17:38:41 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-08-21 18:13:19 -0400 |
| commit | 1d90e79ecd186e0bafbf161e076dd2f67488f359 (patch) | |
| tree | 50b9489930348158792105677d641e02361a225f /fs | |
| parent | 50ace7edc7d1015bb142b148c30cbd8992796cab (diff) | |
bcachefs: Fix a btree iter bug when iter pos == POS_MAX
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/bcachefs/btree_iter.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index 4f8eb2cb40f1..ad31a07c1942 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -35,7 +35,16 @@ static inline int __btree_iter_pos_cmp(struct btree_iter *iter, return cmp; if (bkey_deleted(k)) return -1; - if (iter->flags & BTREE_ITER_IS_EXTENTS) + + /* + * Normally, for extents we want the first key strictly greater than + * the iterator position - with the exception that for interior nodes, + * we don't want to advance past the last key if the iterator position + * is POS_MAX: + */ + if (iter->flags & BTREE_ITER_IS_EXTENTS && + (!interior_node || + bkey_cmp_left_packed_byval(b, k, POS_MAX))) return -1; return 1; } @@ -690,8 +699,7 @@ static inline bool btree_iter_pos_after_node(struct btree_iter *iter, struct btree *b) { return __btree_iter_pos_cmp(iter, NULL, - bkey_to_packed(&b->key), true) < 0 && - bkey_cmp(b->key.k.p, POS_MAX); + bkey_to_packed(&b->key), true) < 0; } static inline bool btree_iter_pos_in_node(struct btree_iter *iter, |