diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-06-09 16:56:16 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:08:23 -0400 |
| commit | 436c656d468fe04cd8e313a4a55151aa946de102 (patch) | |
| tree | ed1a1523fce5d476afe105b609d9e18da4171b64 /fs/bcachefs/bkey_sort.c | |
| parent | 1ae973345626fcd9cdb81fe856cabf7808a33140 (diff) | |
bcachefs: bkey_merge() now takes bkey_s
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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/bcachefs/bkey_sort.c b/fs/bcachefs/bkey_sort.c index 12825c1b292f..d4fbb694ee52 100644 --- a/fs/bcachefs/bkey_sort.c +++ b/fs/bcachefs/bkey_sort.c @@ -257,7 +257,7 @@ static void extent_sort_append(struct bch_fs *c, bch2_bkey_unpack(b, &tmp.k, k); if (*prev && - bch2_bkey_merge(c, (void *) *prev, &tmp.k)) + bch2_bkey_merge(c, bkey_i_to_s((void *) *prev), bkey_i_to_s(&tmp.k))) return; if (*prev) { @@ -436,7 +436,9 @@ bch2_sort_repack_merge(struct bch_fs *c, /* prev is always unpacked, for key merging: */ if (prev && - bch2_bkey_merge(c, (void *) prev, &tmp.k) == + bch2_bkey_merge(c, + bkey_i_to_s((void *) prev), + bkey_i_to_s(&tmp.k)) == BCH_MERGE_MERGE) continue; |