Commit 38200544 authored by Kent Overstreet's avatar Kent Overstreet Committed by Kent Overstreet

bcachefs: Don't squash return code in check_dirents()

We were squashing BCH_FSCK_ERRORS_NOT_FIXED.
Signed-off-by: default avatarKent Overstreet <kent.overstreet@gmail.com>
parent b97bbd4e
...@@ -727,7 +727,7 @@ static int check_dirent(struct btree_trans *trans, struct btree_iter *iter, ...@@ -727,7 +727,7 @@ static int check_dirent(struct btree_trans *trans, struct btree_iter *iter,
k = bch2_btree_iter_peek(iter); k = bch2_btree_iter_peek(iter);
if (!k.k) if (!k.k)
return 1; return 0;
ret = bkey_err(k); ret = bkey_err(k);
if (ret) if (ret)
...@@ -904,19 +904,12 @@ static int check_dirents(struct bch_fs *c) ...@@ -904,19 +904,12 @@ static int check_dirents(struct bch_fs *c)
BTREE_ITER_INTENT| BTREE_ITER_INTENT|
BTREE_ITER_PREFETCH); BTREE_ITER_PREFETCH);
while (1) { do {
ret = lockrestart_do(&trans, ret = lockrestart_do(&trans,
check_dirent(&trans, iter, &hash_info, &w, &nr_subdirs)); check_dirent(&trans, iter, &hash_info, &w, &nr_subdirs));
if (ret == 1) {
/* at end */
ret = 0;
break;
}
if (ret) if (ret)
break; break;
} while (bch2_btree_iter_advance(iter));
bch2_btree_iter_advance(iter);
}
bch2_trans_iter_put(&trans, iter); bch2_trans_iter_put(&trans, iter);
return bch2_trans_exit(&trans) ?: ret; return bch2_trans_exit(&trans) ?: ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment