diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-04-09 15:07:11 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:09:31 -0400 |
| commit | aae29082c63a4bfb7b6be5bc22b4727b7da14a7f (patch) | |
| tree | 5e9bacf3f3aec0758bbb0e1a9347ea4b60c7711c /fs/bcachefs/alloc_background.c | |
| parent | 7c4ca54ae68c4ae24dbfb8b209657a5249a5f0b7 (diff) | |
bcachefs: bch2_btree_delete_extent_at()
New helper, for deleting extents.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Diffstat (limited to 'fs/bcachefs/alloc_background.c')
| -rw-r--r-- | fs/bcachefs/alloc_background.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/fs/bcachefs/alloc_background.c b/fs/bcachefs/alloc_background.c index 3feaac33aaff..6110d4ce4e5f 100644 --- a/fs/bcachefs/alloc_background.c +++ b/fs/bcachefs/alloc_background.c @@ -706,7 +706,6 @@ static int bch2_check_discard_freespace_key(struct btree_trans *trans, struct bch_alloc_v4 a; u64 genbits; struct bpos pos; - struct bkey_i *update; enum bch_data_type state = iter->btree_id == BTREE_ID_need_discard ? BCH_DATA_need_discard : BCH_DATA_free; @@ -756,21 +755,8 @@ fsck_err: printbuf_exit(&buf); return ret; delete: - if (iter->btree_id == BTREE_ID_freespace) { - /* should probably add a helper for deleting extents */ - update = bch2_trans_kmalloc(trans, sizeof(*update)); - ret = PTR_ERR_OR_ZERO(update); - if (ret) - goto err; - - bkey_init(&update->k); - update->k.p = iter->pos; - bch2_key_resize(&update->k, 1); - - ret = bch2_trans_update(trans, iter, update, 0); - } else { - ret = bch2_btree_delete_at(trans, iter, 0); - } + ret = bch2_btree_delete_extent_at(trans, iter, + iter->btree_id == BTREE_ID_freespace ? 1 : 0, 0); goto out; } |