]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
bcachefs: Switch bch2_btree_delete_range() to bch2_trans_run()
authorKent Overstreet <kent.overstreet@gmail.com>
Thu, 11 Aug 2022 21:25:25 +0000 (17:25 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Sun, 22 Oct 2023 21:09:38 +0000 (17:09 -0400)
This fixes an assertion about unexpected transaction restarts -
bch2_delete_range_trans() handles transaction restarts.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
fs/bcachefs/btree_update_leaf.c

index 1371b7c6ff8b109f7eee4d42ab2e9455a984bc3a..6bf34853f26140a79077d59e35d254e5eb0bf491 100644 (file)
@@ -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)