diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-03-11 14:59:58 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:08:21 -0400 |
| commit | 932aa837453ada12342d89ea5e063993a928d4c8 (patch) | |
| tree | 95fd8eda178c31fd695714cbe9fcae3f189952a6 /fs/bcachefs/ec.c | |
| parent | c43a6ef9a0747ef1094ff14e173513070ed91600 (diff) | |
| download | lwn-932aa837453ada12342d89ea5e063993a928d4c8.tar.gz lwn-932aa837453ada12342d89ea5e063993a928d4c8.zip | |
bcachefs: bch2_trans_mark_update()
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/ec.c')
| -rw-r--r-- | fs/bcachefs/ec.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/fs/bcachefs/ec.c b/fs/bcachefs/ec.c index 1eacd9665c7d..6761b5c24a12 100644 --- a/fs/bcachefs/ec.c +++ b/fs/bcachefs/ec.c @@ -539,14 +539,17 @@ static int ec_stripe_mem_alloc(struct bch_fs *c, struct btree_iter *iter) { size_t idx = iter->pos.offset; + int ret = 0; if (!__ec_stripe_mem_alloc(c, idx, GFP_NOWAIT|__GFP_NOWARN)) - return 0; + return ret; bch2_btree_trans_unlock(iter->trans); + ret = -EINTR; if (!__ec_stripe_mem_alloc(c, idx, GFP_KERNEL)) - return -EINTR; + return ret; + return -ENOMEM; } @@ -692,23 +695,22 @@ retry: if (!ret) ret = -ENOSPC; - goto out; + goto err; found_slot: ret = ec_stripe_mem_alloc(c, iter); - - if (ret == -EINTR) - goto retry; if (ret) - return ret; + goto err; stripe->k.p = iter->pos; bch2_trans_update(&trans, BTREE_INSERT_ENTRY(iter, &stripe->k_i)); ret = bch2_trans_commit(&trans, NULL, NULL, - BTREE_INSERT_NOFAIL| - BTREE_INSERT_USE_RESERVE); -out: + BTREE_INSERT_ATOMIC| + BTREE_INSERT_NOFAIL); +err: + if (ret == -EINTR) + goto retry; bch2_trans_exit(&trans); return ret; @@ -745,6 +747,7 @@ static int ec_stripe_update_ptrs(struct bch_fs *c, int ret = 0, dev, idx; bch2_trans_init(&trans, c); + bch2_trans_preload_iters(&trans); iter = bch2_trans_get_iter(&trans, BTREE_ID_EXTENTS, bkey_start_pos(pos), |