Update bcachefs sources to 0010403265 bcachefs: Fix spurious alloc errors on forced...

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

diff --git a/libbcachefs/recovery.c b/libbcachefs/recovery.c
index 0b3521c9cc19ef3ba285805a05de94bcc8bfd717..d24cef2bf1aa3252b611e1fee6e84a41dc2b4964 100644 (file)
--- a/libbcachefs/recovery.c
+++ b/libbcachefs/recovery.c
@@ -187,7 +187,7 @@ void bch2_btree_and_journal_iter_init(struct btree_and_journal_iter *iter,
 {
        memset(iter, 0, sizeof(*iter));
 
-       iter->btree = bch2_trans_get_iter(trans, id, pos, 0);
+       iter->btree = bch2_trans_get_iter(trans, id, pos, BTREE_ITER_PREFETCH);
        bch2_journal_iter_init(&iter->journal, journal_keys, id, 0, pos);
 }
 
@@ -443,9 +443,6 @@ retry:
                bch2_cut_back(atomic_end, split);
 
                split_iter = bch2_trans_copy_iter(&trans, iter);
-               ret = PTR_ERR_OR_ZERO(split_iter);
-               if (ret)
-                       goto err;
 
                /*
                 * It's important that we don't go through the
@@ -502,8 +499,6 @@ static int __bch2_journal_replay_key(struct btree_trans *trans,
        iter = bch2_trans_get_node_iter(trans, id, k->k.p,
                                        BTREE_MAX_DEPTH, level,
                                        BTREE_ITER_INTENT);
-       if (IS_ERR(iter))
-               return PTR_ERR(iter);
 
        /*
         * iter->flags & BTREE_ITER_IS_EXTENTS triggers the update path to run
@@ -538,8 +533,7 @@ static int __bch2_alloc_replay_key(struct btree_trans *trans, struct bkey_i *k)
                                   BTREE_ITER_CACHED|
                                   BTREE_ITER_CACHED_NOFILL|
                                   BTREE_ITER_INTENT);
-       ret =   PTR_ERR_OR_ZERO(iter) ?:
-               bch2_trans_update(trans, iter, k, BTREE_TRIGGER_NORUN);
+       ret = bch2_trans_update(trans, iter, k, BTREE_TRIGGER_NORUN);
        bch2_trans_iter_put(trans, iter);
        return ret;
 }