diff options
Diffstat (limited to 'drivers/md/bcache/bset.h')
-rw-r--r-- | drivers/md/bcache/bset.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/md/bcache/bset.h b/drivers/md/bcache/bset.h index 759df830bb14..487373057c09 100644 --- a/drivers/md/bcache/bset.h +++ b/drivers/md/bcache/bset.h | |||
@@ -287,6 +287,7 @@ void bch_btree_keys_init(struct btree_keys *, const struct btree_keys_ops *, | |||
287 | void bch_bset_init_next(struct btree_keys *, struct bset *, uint64_t); | 287 | void bch_bset_init_next(struct btree_keys *, struct bset *, uint64_t); |
288 | void bch_bset_build_written_tree(struct btree_keys *); | 288 | void bch_bset_build_written_tree(struct btree_keys *); |
289 | void bch_bset_fix_invalidated_key(struct btree_keys *, struct bkey *); | 289 | void bch_bset_fix_invalidated_key(struct btree_keys *, struct bkey *); |
290 | bool bch_bkey_try_merge(struct btree_keys *, struct bkey *, struct bkey *); | ||
290 | void bch_bset_insert(struct btree_keys *, struct bkey *, struct bkey *); | 291 | void bch_bset_insert(struct btree_keys *, struct bkey *, struct bkey *); |
291 | unsigned bch_btree_insert_key(struct btree_keys *, struct bkey *, | 292 | unsigned bch_btree_insert_key(struct btree_keys *, struct bkey *, |
292 | struct bkey *); | 293 | struct bkey *); |
@@ -299,17 +300,6 @@ enum { | |||
299 | BTREE_INSERT_STATUS_FRONT_MERGE, | 300 | BTREE_INSERT_STATUS_FRONT_MERGE, |
300 | }; | 301 | }; |
301 | 302 | ||
302 | /* | ||
303 | * Tries to merge l and r: l should be lower than r | ||
304 | * Returns true if we were able to merge. If we did merge, l will be the merged | ||
305 | * key, r will be untouched. | ||
306 | */ | ||
307 | static inline bool bch_bkey_try_merge(struct btree_keys *b, | ||
308 | struct bkey *l, struct bkey *r) | ||
309 | { | ||
310 | return b->ops->key_merge ? b->ops->key_merge(b, l, r) : false; | ||
311 | } | ||
312 | |||
313 | /* Btree key iteration */ | 303 | /* Btree key iteration */ |
314 | 304 | ||
315 | struct btree_iter { | 305 | struct btree_iter { |