From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Sun, 19 Mar 2023 18:32:23 +0000 (-0400)
Subject: bcachefs: verify_bucket_evacuated() -> set_btree_iter_dontneed()
X-Git-Tag: io_uring-6.7-2023-11-10~119^2~400
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d59ca7e8c072b4587113ced8e00358368f315626;p=linux-block.git

bcachefs: verify_bucket_evacuated() -> set_btree_iter_dontneed()

This should help with excessive 'would deadlock' transaction restarts.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c
index d94cefec9880..ff4a74de728d 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: