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

bcachefs: Ensure btree_iter_traverse() obeys iter->should_be_locked

Browse Source 
iter->should_be_locked means that if bch2_btree_iter_relock() fails, we
need to restart the transaction.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
This commit is contained in:
Kent Overstreet 2021-07-22 12:39:11 -04:00 committed by Kent Overstreet
parent b4e09b351b
commit e829b7175b
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/bcachefs/btree_iter.c
View File

@ -1403,6 +1403,15 @@ static int btree_iter_traverse_one(struct btree_iter *iter,
unsigned l, depth_want = iter->level;
int ret = 0;
/*
* Ensure we obey iter->should_be_locked: if it's set, we can't unlock
* and re-traverse the iterator without a transaction restart:
*/
if (iter->should_be_locked) {
ret = bch2_btree_iter_relock(iter, trace_ip) ? 0 : -EINTR;
goto out;
}
if (btree_iter_type(iter) == BTREE_ITER_CACHED) {
ret = bch2_btree_iter_traverse_cached(iter);
goto out;