From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Wed, 3 Apr 2019 21:11:15 +0000 (-0400)
Subject: bcachefs: free trans->mem on commit
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2a039f1ee4077050c57c51f0463335d262740430;p=linux.git

bcachefs: free trans->mem on commit

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

diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c
index 6fa9fa5768aab..8e686dc42f9dc 100644
--- a/fs/bcachefs/btree_update_leaf.c
+++ b/fs/bcachefs/btree_update_leaf.c
@@ -861,12 +861,15 @@ out_noupdates:
 
 	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: