From 163e885a0aee99657b3819ead6c3390271ed0980 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Wed, 26 Feb 2020 15:39:46 -0500 Subject: bcachefs: Kill TRANS_RESET_MEM|TRANS_RESET_ITERS All iterators should be released now with bch2_trans_iter_put(), so TRANS_RESET_ITERS shouldn't be needed anymore, and TRANS_RESET_MEM is always used. Also convert more code to __bch2_trans_do(). Signed-off-by: Kent Overstreet Signed-off-by: Kent Overstreet --- fs/bcachefs/str_hash.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'fs/bcachefs/str_hash.h') diff --git a/fs/bcachefs/str_hash.h b/fs/bcachefs/str_hash.h index 0710d0bbe36d..9c9549d0a8f6 100644 --- a/fs/bcachefs/str_hash.h +++ b/fs/bcachefs/str_hash.h @@ -163,6 +163,7 @@ bch2_hash_lookup(struct btree_trans *trans, break; } } + bch2_trans_iter_put(trans, iter); return ERR_PTR(ret ?: -ENOENT); } @@ -187,6 +188,9 @@ bch2_hash_hole(struct btree_trans *trans, return iter; } + iter->flags |= BTREE_ITER_KEEP_UNTIL_COMMIT; + bch2_trans_iter_put(trans, iter); + return ERR_PTR(ret ?: -ENOSPC); } -- cgit v1.2.3