diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-07-22 12:39:11 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:09:09 -0400 |
| commit | e829b7175b54c9ccdf4412baea592bc495bc97f1 (patch) | |
| tree | 06be83d51e8816cea507611b52473c0e19c254b8 /fs | |
| parent | b4e09b351be7085cada5c08c1eabee5f0eb498b0 (diff) | |
| download | lwn-e829b7175b54c9ccdf4412baea592bc495bc97f1.tar.gz lwn-e829b7175b54c9ccdf4412baea592bc495bc97f1.zip | |
bcachefs: Ensure btree_iter_traverse() obeys iter->should_be_locked
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/bcachefs/btree_iter.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index ac7a7c18ebe2..b7292f932000 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -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; |