bcachefs: free trans->mem on commit

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

bcachefs: free trans->mem on commit
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
2a039f1e · Kent Overstreet · Kent Overstreet · a1d58243 · 2a039f1e
Commit 2a039f1e authored Apr 03, 2019 by Kent Overstreet Committed by Kent Overstreet Oct 22, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

fs/bcachefs/btree_update_leaf.c fs/bcachefs/btree_update_leaf.c +6 -3

No files found.
--- a/fs/bcachefs/btree_update_leaf.c
+++ b/fs/bcachefs/btree_update_leaf.c
@@ -861,12 +861,15 @@ int bch2_trans_commit(struct btree_trans *trans,

 	BUG_ON(!(trans->flags & BTREE_INSERT_ATOMIC) && ret == -EINTR);

-	bch2_trans_unlink_iters(trans, trans->iters_unlink_on_commit);
 	if (!ret) {
-		bch2_trans_unlink_iters(trans, ~trans->iters_touched);
+		bch2_trans_unlink_iters(trans, ~trans->iters_touched|
+					trans->iters_unlink_on_commit);
 		trans->iters_touched = 0;
+	} else {
+		bch2_trans_unlink_iters(trans, trans->iters_unlink_on_commit);
 	}
-	trans->nr_updates = 0;
+	trans->nr_updates	= 0;
+	trans->mem_top		= 0;

 	return ret;
 err: