From 71603f1ffe03d2409d591e4647377a415376a6b9 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Wed, 16 Oct 2019 13:48:12 -0400 Subject: [PATCH] bcachefs: Fix an iterator counting bug The iterator counting assumed we're doing an obvious optimization when only updating the refcount on indirect extents - but we're not doing it yet. Signed-off-by: Kent Overstreet --- fs/bcachefs/extents.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/fs/bcachefs/extents.c b/fs/bcachefs/extents.c index 8b7d2b8759b0e..16a328a20fb57 100644 --- a/fs/bcachefs/extents.c +++ b/fs/bcachefs/extents.c @@ -971,20 +971,7 @@ static int count_iters_for_insert(struct btree_trans *trans, POS(0, idx + sectors)) >= 0) break; - *nr_iters += 1; - - if (overwrite && - r_k.k->type == KEY_TYPE_reflink_v) { - struct bkey_s_c_reflink_v r = bkey_s_c_to_reflink_v(r_k); - - if (le64_to_cpu(r.v->refcount) == 1) - *nr_iters += bch2_bkey_nr_alloc_ptrs(r_k); - } - - /* - * if we're going to be deleting an entry from - * the reflink btree, need more iters... - */ + *nr_iters += 1 + bch2_bkey_nr_alloc_ptrs(r_k); if (*nr_iters >= max_iters) { struct bpos pos = bkey_start_pos(k.k); -- 2.30.2