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_methods.h | |
| 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_methods.h')
| -rw-r--r-- | fs/bcachefs/bkey_methods.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/bcachefs/bkey_methods.h b/fs/bcachefs/bkey_methods.h index a4bfd2aef5bf..08b976633360 100644 --- a/fs/bcachefs/bkey_methods.h +++ b/fs/bcachefs/bkey_methods.h @@ -33,7 +33,7 @@ struct bkey_ops { void (*swab)(const struct bkey_format *, struct bkey_packed *); bool (*key_normalize)(struct bch_fs *, struct bkey_s); enum merge_result (*key_merge)(struct bch_fs *, - struct bkey_i *, struct bkey_i *); + struct bkey_s, struct bkey_s); }; const char *bch2_bkey_val_invalid(struct bch_fs *, struct bkey_s_c); @@ -57,7 +57,7 @@ void bch2_bkey_swab(const struct bkey_format *, struct bkey_packed *); bool bch2_bkey_normalize(struct bch_fs *, struct bkey_s); enum merge_result bch2_bkey_merge(struct bch_fs *, - struct bkey_i *, struct bkey_i *); + struct bkey_s, struct bkey_s); void bch2_bkey_renumber(enum btree_node_type, struct bkey_packed *, int); |