bcachefs: free trans->mem on commit
authorKent Overstreet <kent.overstreet@gmail.com>
Wed, 3 Apr 2019 21:11:15 +0000 (17:11 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Sun, 22 Oct 2023 21:08:20 +0000 (17:08 -0400)
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/btree_update_leaf.c

index 6fa9fa5768aab5db43cf36deb39b1db89bbe7ccf..8e686dc42f9dc49664ffaa927243f90de987c14a 100644 (file)
@@ -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: