From d59ca7e8c072b4587113ced8e00358368f315626 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sun, 19 Mar 2023 14:32:23 -0400 Subject: [PATCH] bcachefs: verify_bucket_evacuated() -> set_btree_iter_dontneed() This should help with excessive 'would deadlock' transaction restarts. Signed-off-by: Kent Overstreet --- fs/bcachefs/move.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c index d94cefec98805..ff4a74de728d4 100644 --- a/fs/bcachefs/move.c +++ b/fs/bcachefs/move.c @@ -629,6 +629,8 @@ void bch2_verify_bucket_evacuated(struct btree_trans *trans, struct bpos bucket, u64 bp_offset = 0; int ret; + bch2_trans_begin(trans); + bch2_trans_iter_init(trans, &iter, BTREE_ID_alloc, bucket, BTREE_ITER_CACHED); again: @@ -649,6 +651,7 @@ again: } } + set_btree_iter_dontneed(&iter); bch2_trans_iter_exit(trans, &iter); return; failed_to_evacuate: -- 2.30.2