summaryrefslogtreecommitdiff
path: root/libbcachefs/bkey_sort.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2023-11-03 12:09:59 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2023-11-03 12:09:59 -0400
commit13a94807226ac778489a1c2c8cf9f9ecc3684718 (patch)
tree8803e9a4f24841eb7b09fa685f1eed6d9ad25404 /libbcachefs/bkey_sort.c
parent37ee7f0591f28ce285eedc0a8c21bbd65e9a52d2 (diff)
Update bcachefs sources to d464ec667b2b bcachefs: Add missing printk newlines
Diffstat (limited to 'libbcachefs/bkey_sort.c')
-rw-r--r--libbcachefs/bkey_sort.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libbcachefs/bkey_sort.c b/libbcachefs/bkey_sort.c
index b9aa027c..bcca9e76 100644
--- a/libbcachefs/bkey_sort.c
+++ b/libbcachefs/bkey_sort.c
@@ -106,7 +106,7 @@ bch2_key_sort_fix_overlapping(struct bch_fs *c, struct bset *dst,
while ((k = sort_iter_peek(iter))) {
if (!bkey_deleted(k) &&
!should_drop_next_key(iter)) {
- bkey_copy(out, k);
+ bkey_p_copy(out, k);
btree_keys_account_key_add(&nr, 0, out);
out = bkey_p_next(out);
}
@@ -137,7 +137,7 @@ bch2_sort_repack(struct bset *dst, struct btree *src,
continue;
if (!transform)
- bkey_copy(out, in);
+ bkey_p_copy(out, in);
else if (bch2_bkey_transform(out_f, out, bkey_packed(in)
? in_f : &bch2_bkey_format_current, in))
out->format = KEY_FORMAT_LOCAL_BTREE;
@@ -191,7 +191,7 @@ unsigned bch2_sort_keys(struct bkey_packed *dst,
memcpy_u64s_small(out, in, bkeyp_key_u64s(f, in));
set_bkeyp_val_u64s(f, out, 0);
} else {
- bkey_copy(out, in);
+ bkey_p_copy(out, in);
}
out->needs_whiteout |= needs_whiteout;
out = bkey_p_next(out);