From ee94c413a7ef5f10a2768826b2e576981990c4b8 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Fri, 6 Jan 2023 22:58:19 -0500 Subject: [PATCH] bcachefs: Delete a faulty assertion Signed-off-by: Kent Overstreet --- fs/bcachefs/btree_iter.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index 326742e00159..398db0faa816 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -1011,12 +1011,11 @@ retry_all: } /* - * BTREE_ITER_NEED_RELOCK is ok here - if we called bch2_trans_unlock() - * and relock(), relock() won't relock since path->should_be_locked - * isn't set yet, which is all fine + * We used to assert that all paths had been traversed here + * (path->uptodate < BTREE_ITER_NEED_TRAVERSE); however, since + * path->Should_be_locked is not set yet, we we might have unlocked and + * then failed to relock a path - that's fine. */ - trans_for_each_path(trans, path) - BUG_ON(path->uptodate >= BTREE_ITER_NEED_TRAVERSE); err: bch2_btree_cache_cannibalize_unlock(c);