iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: Fix error handling in traverse_all()

Browse Source 
In btree_path_traverse_all() we were failing to check for -EIO in the
retry loop, and after btree node read error we'd go into an infinite
loop.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
This commit is contained in:
Kent Overstreet 2022-03-07 22:05:49 -05:00 committed by Kent Overstreet
parent 9552e19f6f
commit a897ef6827
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/bcachefs/btree_iter.c
View File

@ -1468,8 +1468,10 @@ retry_all:
*/ */
if (path->uptodate) { if (path->uptodate) {
ret = btree_path_traverse_one(trans, path, 0, _THIS_IP_); ret = btree_path_traverse_one(trans, path, 0, _THIS_IP_);
if (ret) if (ret == -EINTR || ret == -ENOMEM)
goto retry_all; goto retry_all;
if (ret)
goto err;
} else { } else {
i++; i++;
} }
@ -1482,7 +1484,7 @@ retry_all:
*/ */
trans_for_each_path(trans, path) trans_for_each_path(trans, path)
BUG_ON(path->uptodate >= BTREE_ITER_NEED_TRAVERSE); BUG_ON(path->uptodate >= BTREE_ITER_NEED_TRAVERSE);
err:
bch2_btree_cache_cannibalize_unlock(c); bch2_btree_cache_cannibalize_unlock(c);
trans->in_traverse_all = false; trans->in_traverse_all = false;