Update bcachefs sources to e1f6739c4a bcachefs: Fix another iterator counting bug

[bcachefs-tools-debian] / libbcachefs / extent_update.c

diff --git a/libbcachefs/extent_update.c b/libbcachefs/extent_update.c
index 2a7d913bdda3f053d6df6612f9a37ecc7408a404..fd011df3cb9943b2dd9c2ae0f3a80191263c5b41 100644 (file)
--- a/libbcachefs/extent_update.c
+++ b/libbcachefs/extent_update.c
@@ -34,16 +34,10 @@ static int count_iters_for_insert(struct btree_trans *trans,
                                  unsigned offset,
                                  struct bpos *end,
                                  unsigned *nr_iters,
-                                 unsigned max_iters,
-                                 bool overwrite)
+                                 unsigned max_iters)
 {
-       int ret = 0;
+       int ret = 0, ret2 = 0;
 
-       /*
-        * The extent update path requires an _additional_ iterator for each
-        * extent we're inserting and overwriting:
-        */
-       *nr_iters += 1;
        if (*nr_iters >= max_iters) {
                *end = bpos_min(*end, k.k->p);
                ret = 1;
@@ -70,16 +64,20 @@ static int count_iters_for_insert(struct btree_trans *trans,
 
                for_each_btree_key(trans, iter,
                                   BTREE_ID_REFLINK, POS(0, idx + offset),
-                                  BTREE_ITER_SLOTS, r_k, ret) {
+                                  BTREE_ITER_SLOTS, r_k, ret2) {
                        if (bkey_cmp(bkey_start_pos(r_k.k),
                                     POS(0, idx + sectors)) >= 0)
                                break;
 
+                       /* extent_update_to_keys(), for the reflink_v update */
+                       *nr_iters += 1;
+
                        *nr_iters += 1 + bch2_bkey_nr_alloc_ptrs(r_k);
 
                        if (*nr_iters >= max_iters) {
                                struct bpos pos = bkey_start_pos(k.k);
-                               pos.offset += r_k.k->p.offset - idx;
+                               pos.offset += min_t(u64, k.k->size,
+                                                   r_k.k->p.offset - idx);
 
                                *end = bpos_min(*end, pos);
                                ret = 1;
@@ -92,7 +90,7 @@ static int count_iters_for_insert(struct btree_trans *trans,
        }
        }
 
-       return ret;
+       return ret2 ?: ret;
 }
 
 #define EXTENT_ITERS_MAX       (BTREE_ITER_MAX / 3)
@@ -121,8 +119,11 @@ int bch2_extent_atomic_end(struct btree_iter *iter,
 
        *end = bpos_min(insert->k.p, b->key.k.p);
 
+       /* extent_update_to_keys(): */
+       nr_iters += 1;
+
        ret = count_iters_for_insert(trans, bkey_i_to_s_c(insert), 0, end,
-                                    &nr_iters, EXTENT_ITERS_MAX / 2, false);
+                                    &nr_iters, EXTENT_ITERS_MAX / 2);
        if (ret < 0)
                return ret;
 
@@ -139,8 +140,20 @@ int bch2_extent_atomic_end(struct btree_iter *iter,
                        offset = bkey_start_offset(&insert->k) -
                                bkey_start_offset(k.k);
 
+               /* extent_handle_overwrites(): */
+               switch (bch2_extent_overlap(&insert->k, k.k)) {
+               case BCH_EXTENT_OVERLAP_ALL:
+               case BCH_EXTENT_OVERLAP_FRONT:
+                       nr_iters += 1;
+                       break;
+               case BCH_EXTENT_OVERLAP_BACK:
+               case BCH_EXTENT_OVERLAP_MIDDLE:
+                       nr_iters += 2;
+                       break;
+               }
+
                ret = count_iters_for_insert(trans, k, offset, end,
-                                       &nr_iters, EXTENT_ITERS_MAX, true);
+                                       &nr_iters, EXTENT_ITERS_MAX);
                if (ret)
                        break;