Update bcachefs sources to 5a3a4087af bcachefs: Convert a BUG_ON() to a warning

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

diff --git a/libbcachefs/ec.c b/libbcachefs/ec.c
index bdb18c2a0b5c9f903958b6c2b246095c7aeae189..be2eca0fcdf7f67a4c8a210beb3977f329e21326 100644 (file)
--- a/libbcachefs/ec.c
+++ b/libbcachefs/ec.c
@@ -704,26 +704,34 @@ static int ec_stripe_bkey_insert(struct bch_fs *c,
        struct btree_trans trans;
        struct btree_iter *iter;
        struct bkey_s_c k;
+       struct bpos start_pos = POS(0, c->ec_stripe_hint);
        int ret;
 
        bch2_trans_init(&trans, c, 0, 0);
 retry:
        bch2_trans_begin(&trans);
 
-       /* XXX: start pos hint */
-       for_each_btree_key(&trans, iter, BTREE_ID_EC, POS_MIN,
+       for_each_btree_key(&trans, iter, BTREE_ID_EC, start_pos,
                           BTREE_ITER_SLOTS|BTREE_ITER_INTENT, k, ret) {
-               if (bkey_cmp(k.k->p, POS(0, U32_MAX)) > 0)
+               if (bkey_cmp(k.k->p, POS(0, U32_MAX)) > 0) {
+                       if (start_pos.offset) {
+                               start_pos = POS_MIN;
+                               bch2_btree_iter_set_pos(iter, start_pos);
+                               continue;
+                       }
+
+                       ret = -ENOSPC;
                        break;
+               }
 
                if (bkey_deleted(k.k))
                        goto found_slot;
        }
 
-       if (!ret)
-               ret = -ENOSPC;
        goto err;
 found_slot:
+       start_pos = iter->pos;
+
        ret = ec_stripe_mem_alloc(c, iter);
        if (ret)
                goto err;
@@ -738,6 +746,8 @@ found_slot:
 err:
        if (ret == -EINTR)
                goto retry;
+
+       c->ec_stripe_hint = ret ? start_pos.offset : start_pos.offset + 1;
        bch2_trans_exit(&trans);
 
        return ret;
@@ -1163,12 +1173,8 @@ void bch2_ec_stop_dev(struct bch_fs *c, struct bch_dev *ca)
                struct ec_stripe_new *s = NULL;
 
                mutex_lock(&h->lock);
-               bch2_open_buckets_stop_dev(c, ca,
-                                          &h->blocks,
-                                          BCH_DATA_USER);
-               bch2_open_buckets_stop_dev(c, ca,
-                                          &h->parity,
-                                          BCH_DATA_USER);
+               bch2_open_buckets_stop_dev(c, ca, &h->blocks);
+               bch2_open_buckets_stop_dev(c, ca, &h->parity);
 
                if (!h->s)
                        goto unlock;