summaryrefslogtreecommitdiff
path: root/fs/bcachefs/fs-io.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2019-11-20 14:51:30 -0500
committerKent Overstreet <kent.overstreet@linux.dev>2023-10-22 17:08:32 -0400
commit5934a0caf2b5dc25a17ee652a95f25c86fffbcd6 (patch)
tree0bc32be034ad9a2581aaf89b16beff66ff1f28b5 /fs/bcachefs/fs-io.c
parentbd7e82ee2ad45540797d3e36dba24f9824e431ed (diff)
downloadlwn-5934a0caf2b5dc25a17ee652a95f25c86fffbcd6.tar.gz
lwn-5934a0caf2b5dc25a17ee652a95f25c86fffbcd6.zip
bcachefs: bkey_on_stack_reassemble()
Small helper function. Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com> Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/fs-io.c')
-rw-r--r--fs/bcachefs/fs-io.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/bcachefs/fs-io.c b/fs/bcachefs/fs-io.c
index e61f5e2fb695..5beb47805a68 100644
--- a/fs/bcachefs/fs-io.c
+++ b/fs/bcachefs/fs-io.c
@@ -780,8 +780,7 @@ retry:
if (ret)
break;
- bkey_on_stack_realloc(&sk, c, k.k->u64s);
- bkey_reassemble(sk.k, k);
+ bkey_on_stack_reassemble(&sk, c, k);
k = bkey_i_to_s_c(sk.k);
offset_into_extent = iter->pos.offset -
@@ -2476,8 +2475,7 @@ static long bchfs_fcollapse_finsert(struct bch_inode_info *inode,
bkey_cmp(k.k->p, POS(inode->v.i_ino, offset >> 9)) <= 0)
break;
reassemble:
- bkey_on_stack_realloc(&copy, c, k.k->u64s);
- bkey_reassemble(copy.k, k);
+ bkey_on_stack_reassemble(&copy, c, k);
if (insert &&
bkey_cmp(bkey_start_pos(k.k), move_pos) < 0) {