summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2022-08-11 17:25:25 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2022-08-11 19:21:24 -0400
commit49c34dadcad9c33b1e8510b5543d60c40fa0bebd (patch)
tree9bdc829918a2df4cdf46d5bd682ff229b3a169b1
parent00c3c0cf76eb90e853949bb8e935dd2cbdf96b87 (diff)
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 516271388a4d..dd832f12b128 100644
--- a/fs/bcachefs/btree_update_leaf.c
+++ b/fs/bcachefs/btree_update_leaf.c
@@ -1765,9 +1765,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)