bcachefs: Simplify bch2_extent_atomic_end()

It used to be that we had a fixed maximum number of btree paths to work
with - 64.

That's no longer the case, so bch2_extent_atomic_end() doesn't have to
be as strict.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/disk_accounting.c b/fs/bcachefs/disk_accounting.c
index 9f20db560eab2c99d872ed0a182daa8f5ca2be24..488c342b9cd7f83e56f99b0b6db072b5eba44392 100644 (file)
--- a/fs/bcachefs/disk_accounting.c
+++ b/fs/bcachefs/disk_accounting.c
@@ -104,7 +104,7 @@ int bch2_disk_accounting_mod(struct btree_trans *trans,
 
        if (likely(!gc)) {
                struct bkey_i_accounting *a;
-
+#if 0
                for (a = btree_trans_subbuf_base(trans, &trans->accounting);
                     a != btree_trans_subbuf_top(trans, &trans->accounting);
                     a = (void *) bkey_next(&a->k_i))
@@ -113,7 +113,7 @@ int bch2_disk_accounting_mod(struct btree_trans *trans,
                                acc_u64s(a->v.d, d, nr);
                                return 0;
                        }
-
+#endif
                unsigned u64s = sizeof(*a) / sizeof(u64) + nr;
                a = bch2_trans_subbuf_alloc(trans, &trans->accounting, u64s);
                int ret = PTR_ERR_OR_ZERO(a);

diff --git a/fs/bcachefs/extent_update.c b/fs/bcachefs/extent_update.c
index 6bb42985306e6a5cbf4300a35a7668f48106b382..b899ee75f5b9eb9843c6dbf7a89e3e1f6e356590 100644 (file)
--- a/fs/bcachefs/extent_update.c
+++ b/fs/bcachefs/extent_update.c
@@ -37,16 +37,17 @@ static unsigned bch2_bkey_nr_alloc_ptrs(struct bkey_s_c k)
        return lru + ret * 2;
 }
 
+#define EXTENT_ITERS_MAX       64
+
 static int count_iters_for_insert(struct btree_trans *trans,
                                  struct bkey_s_c k,
                                  unsigned offset,
                                  struct bpos *end,
-                                 unsigned *nr_iters,
-                                 unsigned max_iters)
+                                 unsigned *nr_iters)
 {
        int ret = 0, ret2 = 0;
 
-       if (*nr_iters >= max_iters) {
+       if (*nr_iters >= EXTENT_ITERS_MAX) {
                *end = bpos_min(*end, k.k->p);
                ret = 1;
        }
@@ -56,7 +57,7 @@ static int count_iters_for_insert(struct btree_trans *trans,
        case KEY_TYPE_reflink_v:
                *nr_iters += bch2_bkey_nr_alloc_ptrs(k);
 
-               if (*nr_iters >= max_iters) {
+               if (*nr_iters >= EXTENT_ITERS_MAX) {
                        *end = bpos_min(*end, k.k->p);
                        ret = 1;
                }
@@ -81,7 +82,7 @@ static int count_iters_for_insert(struct btree_trans *trans,
 
                        *nr_iters += 1 + bch2_bkey_nr_alloc_ptrs(r_k);
 
-                       if (*nr_iters >= max_iters) {
+                       if (*nr_iters >= EXTENT_ITERS_MAX) {
                                struct bpos pos = bkey_start_pos(k.k);
                                pos.offset += min_t(u64, k.k->size,
                                                    r_k.k->p.offset - idx);
@@ -100,59 +101,31 @@ static int count_iters_for_insert(struct btree_trans *trans,
        return ret2 ?: ret;
 }
 
-#define EXTENT_ITERS_MAX       (BTREE_ITER_INITIAL / 3)
-
 int bch2_extent_atomic_end(struct btree_trans *trans,
                           struct btree_iter *iter,
-                          struct bkey_i *insert,
                           struct bpos *end)
 {
-       struct btree_iter copy;
-       struct bkey_s_c k;
        unsigned nr_iters = 0;
-       int ret;
-
-       ret = bch2_btree_iter_traverse(trans, iter);
-       if (ret)
-               return ret;
-
-       *end = insert->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);
-       if (ret < 0)
-               return ret;
 
+       struct btree_iter copy;
        bch2_trans_copy_iter(trans, &copy, iter);
 
-       for_each_btree_key_max_continue_norestart(trans, copy, insert->k.p, 0, k, ret) {
-               unsigned offset = 0;
+       int ret = bch2_btree_iter_traverse(trans, &copy);
+       if (ret)
+               goto err;
 
-               if (bkey_gt(bkey_start_pos(&insert->k), bkey_start_pos(k.k)))
-                       offset = bkey_start_offset(&insert->k) -
-                               bkey_start_offset(k.k);
+       struct bkey_s_c k;
+       for_each_btree_key_max_continue_norestart(trans, copy, *end, 0, k, ret) {
+               unsigned offset = 0;
 
-               /* 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;
-               }
+               if (bkey_gt(iter->pos, bkey_start_pos(k.k)))
+                       offset = iter->pos.offset - bkey_start_offset(k.k);
 
-               ret = count_iters_for_insert(trans, k, offset, end,
-                                       &nr_iters, EXTENT_ITERS_MAX);
+               ret = count_iters_for_insert(trans, k, offset, end, &nr_iters);
                if (ret)
                        break;
        }
-
+err:
        bch2_trans_iter_exit(trans, &copy);
        return ret < 0 ? ret : 0;
 }
@@ -161,10 +134,8 @@ int bch2_extent_trim_atomic(struct btree_trans *trans,
                            struct btree_iter *iter,
                            struct bkey_i *k)
 {
-       struct bpos end;
-       int ret;
-
-       ret = bch2_extent_atomic_end(trans, iter, k, &end);
+       struct bpos end = k->k.p;
+       int ret = bch2_extent_atomic_end(trans, iter, &end);
        if (ret)
                return ret;
 

diff --git a/fs/bcachefs/extent_update.h b/fs/bcachefs/extent_update.h
index 6f5cf449361a7f1aa6661086c43110c8b2e15455..34467db53f4575c143831485984ca9a792269c06 100644 (file)
--- a/fs/bcachefs/extent_update.h
+++ b/fs/bcachefs/extent_update.h
@@ -5,7 +5,7 @@
 #include "bcachefs.h"
 
 int bch2_extent_atomic_end(struct btree_trans *, struct btree_iter *,
-                          struct bkey_i *, struct bpos *);
+                          struct bpos *);
 int bch2_extent_trim_atomic(struct btree_trans *, struct btree_iter *,
                            struct bkey_i *);