diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2020-03-18 13:40:28 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:08:37 -0400 |
| commit | 8666a9ad6facc153d143728c8b47aae1e8111cd6 (patch) | |
| tree | d98a7f4252601610394eafb448e60389320e468e | |
| parent | 6d61724b2ba1836e4e1f5f8755cb2278d4eae1a0 (diff) | |
bcachefs: Fix an iterator bug
We were incorrectly not restarting the transaction when re-traversing
iterators.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/btree_iter.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index 5f918c6c3efb..8b1395ef4d0e 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -1068,7 +1068,14 @@ retry_all: goto retry_all; } - ret = hweight64(trans->iters_live) > 1 ? -EINTR : 0; + if (hweight64(trans->iters_live) > 1) + ret = -EINTR; + else + trans_for_each_iter(trans, iter) + if (iter->flags & BTREE_ITER_KEEP_UNTIL_COMMIT) { + ret = -EINTR; + break; + } out: bch2_btree_cache_cannibalize_unlock(c); return ret; |