diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-09-19 16:01:32 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2019-09-21 15:09:12 -0400 |
| commit | 58172854caed1f9dbc804c83dd26b2cf353ec0ee (patch) | |
| tree | a1cdb637bd41db9f54b7977ffbb67ec7514e6b05 | |
| parent | 4ddc20ef7ddcde6ed426d5395749ff58ba3b6eec (diff) | |
bcachefs: Add missing bch2_btree_node_iter_fix() call
Any time we're modifying what's in the btree, iterators potentially have
to be updated - this one was exposed by the reflink code.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/btree_update_leaf.c | 5 | ||||
| -rw-r--r-- | fs/bcachefs/extents.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c index baff86cca9b4..d5be691f44a4 100644 --- a/fs/bcachefs/btree_update_leaf.c +++ b/fs/bcachefs/btree_update_leaf.c @@ -183,9 +183,8 @@ bool bch2_btree_bset_insert_key(struct btree_iter *iter, clobber_u64s = 0; overwrite: bch2_bset_insert(b, node_iter, k, insert, clobber_u64s); - if (k->u64s != clobber_u64s || bkey_whiteout(&insert->k)) - bch2_btree_node_iter_fix(iter, b, node_iter, k, - clobber_u64s, k->u64s); + bch2_btree_node_iter_fix(iter, b, node_iter, k, + clobber_u64s, k->u64s); bch2_btree_iter_verify(iter, b); return true; } diff --git a/fs/bcachefs/extents.c b/fs/bcachefs/extents.c index fbae9720c080..39fcf113dc3c 100644 --- a/fs/bcachefs/extents.c +++ b/fs/bcachefs/extents.c @@ -1271,6 +1271,8 @@ static void __bch2_insert_fixup_extent(struct bch_fs *c, btree_account_key_drop(l->b, _k); _k->type = KEY_TYPE_discard; reserve_whiteout(l->b, _k); + bch2_btree_node_iter_fix(iter, l->b, &l->iter, + _k, _k->u64s, _k->u64s); } break; } |