From 5934a0caf2b5dc25a17ee652a95f25c86fffbcd6 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Wed, 20 Nov 2019 14:51:30 -0500 Subject: bcachefs: bkey_on_stack_reassemble() Small helper function. Signed-off-by: Kent Overstreet Signed-off-by: Kent Overstreet --- fs/bcachefs/extent_update.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'fs/bcachefs/extent_update.c') diff --git a/fs/bcachefs/extent_update.c b/fs/bcachefs/extent_update.c index 91ceb5d53f92..742b4d78cb3a 100644 --- a/fs/bcachefs/extent_update.c +++ b/fs/bcachefs/extent_update.c @@ -347,7 +347,7 @@ extent_squash(struct bch_fs *c, struct btree_iter *iter, struct bkey_on_stack split; bkey_on_stack_init(&split); - bkey_on_stack_realloc(&split, c, k.k->u64s); + bkey_on_stack_reassemble(&split, c, k.s_c); /* * The insert key falls 'in the middle' of k @@ -363,7 +363,6 @@ extent_squash(struct bch_fs *c, struct btree_iter *iter, * modify k _before_ doing the insert (which will move * what k points to) */ - bkey_reassemble(split.k, k.s_c); split.k->k.needs_whiteout |= bkey_written(l->b, _k); bch2_cut_back(bkey_start_pos(&insert->k), split.k); -- cgit v1.2.3