summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2022-08-12 00:25:25 +0300
committerKent Overstreet <kent.overstreet@linux.dev>2023-10-23 00:09:38 +0300
commit11c1a62f3b872d2345c97e72700ed4d1b2511888 (patch)
tree47f839668ab18957dbc122bcb3d2e1a792fbb8c0
parent7c812ab786c4a689989aabf9e865164eb4f8004d (diff)
downloadlinux-11c1a62f3b872d2345c97e72700ed4d1b2511888.tar.xz
bcachefs: Switch bch2_btree_delete_range() to bch2_trans_run()
This fixes an assertion about unexpected transaction restarts - bch2_delete_range_trans() handles transaction restarts. Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
-rw-r--r--fs/bcachefs/btree_update_leaf.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c
index 1371b7c6ff8b..6bf34853f261 100644
--- a/fs/bcachefs/btree_update_leaf.c
+++ b/fs/bcachefs/btree_update_leaf.c
@@ -1785,9 +1785,8 @@ int bch2_btree_delete_range(struct bch_fs *c, enum btree_id id,
unsigned update_flags,
u64 *journal_seq)
{
- return bch2_trans_do(c, NULL, journal_seq, 0,
- bch2_btree_delete_range_trans(&trans, id, start, end,
- update_flags, journal_seq));
+ return bch2_trans_run(c,
+ bch2_btree_delete_range_trans(&trans, id, start, end, update_flags, journal_seq));
}
int bch2_trans_log_msg(struct btree_trans *trans, const char *msg)