diff options
author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-11 06:40:24 -0400 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-11 06:40:30 -0400 |
commit | e66011cd2c8aa1c1e78085704a9a2514c6b7ccd1 (patch) | |
tree | 648c7c31a9051580a86d82208498992617cf59ac /libbcachefs/btree_update_leaf.c | |
parent | 0398adf20f4240f87ea33b975336ac3150b08707 (diff) |
Update bcachefs sources to 6dc2a699c6 bcachefs: bch2_path_put_nokeep()
Diffstat (limited to 'libbcachefs/btree_update_leaf.c')
-rw-r--r-- | libbcachefs/btree_update_leaf.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libbcachefs/btree_update_leaf.c b/libbcachefs/btree_update_leaf.c index af3fbfcc..b166ab4b 100644 --- a/libbcachefs/btree_update_leaf.c +++ b/libbcachefs/btree_update_leaf.c @@ -1623,7 +1623,7 @@ int bch2_btree_delete_range_trans(struct btree_trans *trans, enum btree_id id, int ret = 0; bch2_trans_iter_init(trans, &iter, id, start, BTREE_ITER_INTENT); - while ((k = bch2_btree_iter_peek_upto(&iter, bpos_predecessor(end))).k) { + while ((k = bch2_btree_iter_peek(&iter)).k) { struct disk_reservation disk_res = bch2_disk_reservation_init(trans->c, 0); struct bkey_i delete; @@ -1632,6 +1632,9 @@ int bch2_btree_delete_range_trans(struct btree_trans *trans, enum btree_id id, if (ret) goto err; + if (bkey_cmp(iter.pos, end) >= 0) + break; + bkey_init(&delete.k); /* |