From: Kent Overstreet Date: Thu, 11 Aug 2022 21:25:25 +0000 (-0400) Subject: bcachefs: Switch bch2_btree_delete_range() to bch2_trans_run() X-Git-Tag: v6.7-rc1~201^2~840 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11c1a62f3b872d2345c97e72700ed4d1b2511888;p=thirdparty%2Fkernel%2Flinux.git 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 --- diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c index 1371b7c6ff8b1..6bf34853f2614 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)