diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2020-02-26 15:39:46 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:08:35 -0400 |
| commit | 163e885a0aee99657b3819ead6c3390271ed0980 (patch) | |
| tree | 6656ed38b87b7d7b27f716d0de2ca62c09faa9fe /fs/bcachefs/io.c | |
| parent | ac7c51b2180e757feaaabcb84794bcc9912a4edf (diff) | |
| download | lwn-163e885a0aee99657b3819ead6c3390271ed0980.tar.gz lwn-163e885a0aee99657b3819ead6c3390271ed0980.zip | |
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 <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/io.c')
| -rw-r--r-- | fs/bcachefs/io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/bcachefs/io.c b/fs/bcachefs/io.c index 33603624b42a..5f296de282b6 100644 --- a/fs/bcachefs/io.c +++ b/fs/bcachefs/io.c @@ -335,7 +335,7 @@ int bch2_fpunch_at(struct btree_trans *trans, struct btree_iter *iter, bch2_disk_reservation_init(c, 0); struct bkey_i delete; - bch2_trans_reset(trans, TRANS_RESET_MEM); + bch2_trans_begin(trans); ret = bkey_err(k); if (ret) @@ -409,7 +409,7 @@ int bch2_write_index_default(struct bch_write_op *op) BTREE_ITER_SLOTS|BTREE_ITER_INTENT); do { - bch2_trans_reset(&trans, TRANS_RESET_MEM); + bch2_trans_begin(&trans); k = bch2_keylist_front(keys); |