diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-11-20 14:51:30 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:08:32 -0400 |
| commit | 5934a0caf2b5dc25a17ee652a95f25c86fffbcd6 (patch) | |
| tree | 0bc32be034ad9a2581aaf89b16beff66ff1f28b5 /fs/bcachefs/bkey_sort.c | |
| parent | bcachefs: kill ca->freelist_lock (diff) | |
| download | linux-5934a0caf2b5dc25a17ee652a95f25c86fffbcd6.tar.gz linux-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/bkey_sort.c')
| -rw-r--r-- | fs/bcachefs/bkey_sort.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/bcachefs/bkey_sort.c b/fs/bcachefs/bkey_sort.c index daef8e5c599f..2e205db5433d 100644 --- a/fs/bcachefs/bkey_sort.c +++ b/fs/bcachefs/bkey_sort.c @@ -356,12 +356,11 @@ struct btree_nr_keys bch2_extent_sort_fix_overlapping(struct bch_fs *c, extent_sort_sift(iter, b, _r - iter->data); } else if (bkey_cmp(l.k->p, r.k->p) > 0) { - bkey_on_stack_realloc(&split, c, l.k->u64s); /* * r wins, but it overlaps in the middle of l - split l: */ - bkey_reassemble(split.k, l.s_c); + bkey_on_stack_reassemble(&split, c, l.s_c); bch2_cut_back(bkey_start_pos(r.k), split.k); bch2_cut_front_s(r.k->p, l); |