summaryrefslogtreecommitdiffstats
path: root/fs/bcachefs/migrate.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2019-09-22 18:49:16 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2023-10-22 17:08:28 -0400
commita7199432c3cbcd42141cfd5c047bf8828c2390d8 (patch)
tree50290b89d2946e5cfcac71c886531fa40b7b4ffe /fs/bcachefs/migrate.c
parent877dfb348d90abc3d7464ee37240f21d9bdff630 (diff)
downloadlinux-stable-a7199432c3cbcd42141cfd5c047bf8828c2390d8.tar.gz
linux-stable-a7199432c3cbcd42141cfd5c047bf8828c2390d8.tar.bz2
linux-stable-a7199432c3cbcd42141cfd5c047bf8828c2390d8.zip
bcachefs: Kill deferred btree updates
Will be replaced by cached btree iterators Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/migrate.c')
-rw-r--r--fs/bcachefs/migrate.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/bcachefs/migrate.c b/fs/bcachefs/migrate.c
index dc3b03d6e627..de8522f754e2 100644
--- a/fs/bcachefs/migrate.c
+++ b/fs/bcachefs/migrate.c
@@ -72,10 +72,9 @@ static int __bch2_dev_usrdata_drop(struct bch_fs *c, unsigned dev_idx, int flags
*/
bch2_extent_normalize(c, bkey_i_to_s(&tmp.key));
- /* XXX not sketchy at all */
- iter->pos = bkey_start_pos(&tmp.key.k);
+ bch2_btree_iter_set_pos(iter, bkey_start_pos(&tmp.key.k));
- bch2_trans_update(&trans, BTREE_INSERT_ENTRY(iter, &tmp.key));
+ bch2_trans_update(&trans, iter, &tmp.key);
ret = bch2_trans_commit(&trans, NULL, NULL,
BTREE_INSERT_ATOMIC|