From: Kent Overstreet Date: Sat, 5 Mar 2022 20:21:07 +0000 (-0500) Subject: bcachefs: Don't keep around btree_paths unnecessarily X-Git-Tag: v6.7-rc1~201^2~1077 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1f7fa06a8ed48feedd5f538fc4724734c6e1869;p=thirdparty%2Fkernel%2Flinux.git bcachefs: Don't keep around btree_paths unnecessarily When bch2_trans_begin() is called and there hasn't been a transaction restart, we presume that we're now doing something new - iterating over different keys, and we now shouldn't keep aruond paths related to the previous transaction, excepting the subvolumes btree. This should fix some of our "transaction path overflow" bugs. Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index b65cd3566872e..109efa73cd4ce 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -3012,6 +3012,14 @@ void bch2_trans_begin(struct btree_trans *trans) trans_for_each_path(trans, path) { path->should_be_locked = false; + /* + * If the transaction wasn't restarted, we're presuming to be + * doing something new: dont keep iterators excpt the ones that + * are in use - except for the subvolumes btree: + */ + if (!trans->restarted && path->btree_id != BTREE_ID_subvolumes) + path->preserve = false; + /* * XXX: we probably shouldn't be doing this if the transaction * was restarted, but currently we still overflow transaction