diff options
| author | Nicholas Swenson <nks@daterainc.com> | 2013-10-15 03:53:16 +0200 |
|---|---|---|
| committer | Kent Overstreet <kmo@daterainc.com> | 2014-01-08 22:05:14 +0100 |
| commit | 0f49cf3d83fbf038534c9302095b66b07b9838c3 (patch) | |
| tree | 539bb39097a9e06b998be0586bd47dd385f02bab /drivers/md/bcache/bset.h | |
| parent | bcache: Move insert_fixup() to btree_keys_ops (diff) | |
| download | linux-0f49cf3d83fbf038534c9302095b66b07b9838c3.tar.xz linux-0f49cf3d83fbf038534c9302095b66b07b9838c3.zip | |
bcache: update bch_bkey_try_merge
Added generic header checks to bch_bkey_try_merge,
which then calls the bkey specific function
Removed extraneous checks from bch_extent_merge
Signed-off-by: Nicholas Swenson <nks@daterainc.com>
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 *, void bch_bset_init_next(struct btree_keys *, struct bset *, uint64_t); void bch_bset_build_written_tree(struct btree_keys *); void bch_bset_fix_invalidated_key(struct btree_keys *, struct bkey *); +bool bch_bkey_try_merge(struct btree_keys *, struct bkey *, struct bkey *); void bch_bset_insert(struct btree_keys *, struct bkey *, struct bkey *); unsigned bch_btree_insert_key(struct btree_keys *, struct bkey *, struct bkey *); @@ -299,17 +300,6 @@ enum { BTREE_INSERT_STATUS_FRONT_MERGE, }; -/* - * Tries to merge l and r: l should be lower than r - * Returns true if we were able to merge. If we did merge, l will be the merged - * key, r will be untouched. - */ -static inline bool bch_bkey_try_merge(struct btree_keys *b, - struct bkey *l, struct bkey *r) -{ - return b->ops->key_merge ? b->ops->key_merge(b, l, r) : false; -} - /* Btree key iteration */ struct btree_iter { |