summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs/bcachefs/btree_iter.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
index 8186ee7e23ff..847ea7244121 100644
--- a/fs/bcachefs/btree_iter.c
+++ b/fs/bcachefs/btree_iter.c
@@ -1484,8 +1484,10 @@ retry_all:
*/
if (path->uptodate) {
ret = btree_path_traverse_one(trans, path, 0, _THIS_IP_);
- if (ret)
+ if (ret == -EINTR || ret == -ENOMEM)
goto retry_all;
+ if (ret)
+ goto err;
} else {
i++;
}
@@ -1498,7 +1500,7 @@ retry_all:
*/
trans_for_each_path(trans, path)
BUG_ON(path->uptodate >= BTREE_ITER_NEED_TRAVERSE);
-
+err:
bch2_btree_cache_cannibalize_unlock(c);
trans->in_traverse_all = false;