iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: Fix a btree iter bug when iter pos == POS_MAX

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2018-08-21 17:38:41 -04:00 committed by Kent Overstreet
parent a00fd8c535
commit cbdf24cef1
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/bcachefs/btree_iter.c
View File

@ -36,7 +36,16 @@ static inline int __btree_iter_pos_cmp(struct btree_iter *iter,
return cmp; return cmp;
if (bkey_deleted(k)) if (bkey_deleted(k))
return -1; 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;
return 1; return 1;
} }
@ -691,8 +700,7 @@ static inline bool btree_iter_pos_after_node(struct btree_iter *iter,
struct btree *b) struct btree *b)
{ {
return __btree_iter_pos_cmp(iter, NULL, return __btree_iter_pos_cmp(iter, NULL,
bkey_to_packed(&b->key), true) < 0 && bkey_to_packed(&b->key), true) < 0;
bkey_cmp(b->key.k.p, POS_MAX);
} }
static inline bool btree_iter_pos_in_node(struct btree_iter *iter, static inline bool btree_iter_pos_in_node(struct btree_iter *iter,