diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-07-14 02:08:58 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:09:36 -0400 |
| commit | dadecd02c49c7bb14c04445fc514c394e28c1ae3 (patch) | |
| tree | 13c5f6470106c8a9ee7d0cfac9e466279e96d984 /fs/bcachefs/journal.c | |
| parent | 326568f18cb57ed95a420361da9a64330e122cda (diff) | |
| download | linux-dadecd02c49c7bb14c04445fc514c394e28c1ae3.tar.gz linux-dadecd02c49c7bb14c04445fc514c394e28c1ae3.tar.bz2 linux-dadecd02c49c7bb14c04445fc514c394e28c1ae3.zip | |
bcachefs: bch2_trans_run()
This adds a new helper, bch2_trans_run(), that runs a function with a
btree_transaction context but without handling transaction restarts.
We're adding checks for nested transaction restart handling: when an
inner transaction handles a transaction restart it will still have to
return it to the outer transaction, or else assertions will be popped in
the outer transaction.
But some places don't need restart handling at the outer scope, so this
helper does what they need.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Diffstat (limited to 'fs/bcachefs/journal.c')
| -rw-r--r-- | fs/bcachefs/journal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/bcachefs/journal.c b/fs/bcachefs/journal.c index a71bd1bb4066..26f60db751ca 100644 --- a/fs/bcachefs/journal.c +++ b/fs/bcachefs/journal.c @@ -882,7 +882,7 @@ static int __bch2_set_nr_journal_buckets(struct bch_dev *ca, unsigned nr, if (!new_fs) { for (i = 0; i < nr_got; i++) { - ret = bch2_trans_do(c, NULL, NULL, BTREE_INSERT_NOFAIL, + ret = bch2_trans_run(c, bch2_trans_mark_metadata_bucket(&trans, ca, bu[i], BCH_DATA_journal, ca->mi.bucket_size)); |