diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-07-17 00:44:19 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-03 22:52:26 -0400 |
| commit | d101c89b83af3cb9b3fa1cd32342d2c079b714f1 (patch) | |
| tree | 7ac1ec37567b6fd6c953a83c98bc34b68f113f95 | |
| parent | 7b0974ec18aa39d86efd1f01af9b9e993a2c55dd (diff) | |
bcachefs: Convert bch2_dev_freespace_init() to for_each_btree_key_commit()
The new for_each_btree_key2() macro handles transaction retries,
allowing us to avoid nested transactions - which we want to avoid since
they're tricky to do completely correctly and upcoming assertions are
going to be checking for that.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/alloc_background.c | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/fs/bcachefs/alloc_background.c b/fs/bcachefs/alloc_background.c index 6844cdf95812..03bb1f3a8519 100644 --- a/fs/bcachefs/alloc_background.c +++ b/fs/bcachefs/alloc_background.c @@ -1301,16 +1301,13 @@ void bch2_do_invalidates(struct bch_fs *c) percpu_ref_put(&c->writes); } -static int bucket_freespace_init(struct btree_trans *trans, struct btree_iter *iter) +static int bucket_freespace_init(struct btree_trans *trans, struct btree_iter *iter, + struct bkey_s_c k, struct bch_dev *ca) { struct bch_alloc_v4 a; - struct bkey_s_c k; - int ret; - k = bch2_btree_iter_peek_slot(iter); - ret = bkey_err(k); - if (ret) - return ret; + if (iter->pos.offset >= ca->mi.nbuckets) + return 1; bch2_alloc_to_v4(k, &a); return bch2_bucket_do_index(trans, k, &a, true); @@ -1326,24 +1323,15 @@ static int bch2_dev_freespace_init(struct bch_fs *c, struct bch_dev *ca) bch2_trans_init(&trans, c, 0, 0); - for_each_btree_key(&trans, iter, BTREE_ID_alloc, - POS(ca->dev_idx, ca->mi.first_bucket), - BTREE_ITER_SLOTS| - BTREE_ITER_PREFETCH, k, ret) { - if (iter.pos.offset >= ca->mi.nbuckets) - break; - - ret = commit_do(&trans, NULL, NULL, - BTREE_INSERT_LAZY_RW, - bucket_freespace_init(&trans, &iter)); - if (ret) - break; - } - bch2_trans_iter_exit(&trans, &iter); + ret = for_each_btree_key_commit(&trans, iter, BTREE_ID_alloc, + POS(ca->dev_idx, ca->mi.first_bucket), + BTREE_ITER_SLOTS|BTREE_ITER_PREFETCH, k, + NULL, NULL, BTREE_INSERT_LAZY_RW, + bucket_freespace_init(&trans, &iter, k, ca)); bch2_trans_exit(&trans); - if (ret) { + if (ret < 0) { bch_err(ca, "error initializing free space: %i", ret); return ret; } @@ -1353,7 +1341,7 @@ static int bch2_dev_freespace_init(struct bch_fs *c, struct bch_dev *ca) SET_BCH_MEMBER_FREESPACE_INITIALIZED(m, true); mutex_unlock(&c->sb_lock); - return ret; + return 0; } int bch2_fs_freespace_init(struct bch_fs *c) |