Update bcachefs sources to d82da7126f fixup! bcachefs: for_each_btree_key2()

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

diff --git a/libbcachefs/btree_iter.c b/libbcachefs/btree_iter.c
index 05bd0d60b5fb929bda98d319d75789c422e4424c..e014dfc7e62eca3040a1f0a2be154487fba6b1d0 100644 (file)
--- a/libbcachefs/btree_iter.c
+++ b/libbcachefs/btree_iter.c
@@ -1663,6 +1663,9 @@ out:
 int __must_check bch2_btree_path_traverse(struct btree_trans *trans,
                                          struct btree_path *path, unsigned flags)
 {
+       if (!(local_clock() % 128))
+               return btree_trans_restart(trans);
+
        if (path->uptodate < BTREE_ITER_NEED_RELOCK)
                return 0;
 
@@ -3242,12 +3245,19 @@ void bch2_trans_begin(struct btree_trans *trans)
                        path->preserve = false;
        }
 
-       bch2_trans_cond_resched(trans);
+       if (!trans->restarted &&
+           (need_resched() ||
+            ktime_get_ns() - trans->last_begin_time > BTREE_TRANS_MAX_LOCK_HOLD_TIME_NS)) {
+               bch2_trans_unlock(trans);
+               cond_resched();
+               bch2_trans_relock(trans);
+       }
 
        if (trans->restarted)
                bch2_btree_path_traverse_all(trans);
 
        trans->restarted = false;
+       trans->last_begin_time = ktime_get_ns();
 }
 
 static void bch2_trans_alloc_paths(struct btree_trans *trans, struct bch_fs *c)
@@ -3281,6 +3291,7 @@ void __bch2_trans_init(struct btree_trans *trans, struct bch_fs *c,
        memset(trans, 0, sizeof(*trans));
        trans->c                = c;
        trans->fn               = fn;
+       trans->last_begin_time  = ktime_get_ns();
        trans->task             = current;
 
        bch2_trans_alloc_paths(trans, c);