From dae7fab1616148b79a4948aa285202cc22a67024 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Mon, 6 Sep 2021 17:00:35 -0400 Subject: bcachefs: Only mark iterators nopreserve that aren't in use Signed-off-by: Kent Overstreet --- fs/bcachefs/btree_iter.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index 761153601e75..06fc10cd3b48 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -2488,6 +2488,8 @@ void bch2_trans_begin(struct btree_trans *trans) } trans_for_each_path(trans, path) { + path->should_be_locked = false; + /* * XXX: we probably shouldn't be doing this if the transaction * was restarted, but currently we still overflow transaction @@ -2495,8 +2497,8 @@ void bch2_trans_begin(struct btree_trans *trans) */ if (!path->ref && !path->preserve) __bch2_path_free(trans, path); - else - path->preserve = path->should_be_locked = false; + else if (!path->ref) + path->preserve = false; } bch2_trans_cond_resched(trans); -- cgit v1.2.3