summaryrefslogtreecommitdiff
path: root/drivers/md/bcache/bset.c
diff options
context:
space:
mode:
authorNicholas Swenson <nks@daterainc.com>2013-11-12 07:36:25 +0400
committerKent Overstreet <kmo@daterainc.com>2014-01-09 01:05:14 +0400
commit3bdad1e40d11aad31f2322f21e943c31ef20d9da (patch)
tree2b268d6b0944b97338d3b7a190443551b565e562 /drivers/md/bcache/bset.c
parent0f49cf3d83fbf038534c9302095b66b07b9838c3 (diff)
downloadlinux-3bdad1e40d11aad31f2322f21e943c31ef20d9da.tar.xz
bcache: Add bch_bkey_equal_header()
Checks if two keys have equivalent header fields. (good enough for replacement or merging) Used in bch_bkey_try_merge, and replacing a key in the btree. Signed-off-by: Nicholas Swenson <nks@daterainc.com> Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Diffstat (limited to 'drivers/md/bcache/bset.c')
-rw-r--r--drivers/md/bcache/bset.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/md/bcache/bset.c b/drivers/md/bcache/bset.c
index 7f8a7bd21503..f990403c4f1c 100644
--- a/drivers/md/bcache/bset.c
+++ b/drivers/md/bcache/bset.c
@@ -788,12 +788,8 @@ bool bch_bkey_try_merge(struct btree_keys *b, struct bkey *l, struct bkey *r)
* Assumes left and right are in order
* Left and right must be exactly aligned
*/
- if (KEY_U64s(l) != KEY_U64s(r) ||
- KEY_DELETED(l) != KEY_DELETED(r) ||
- KEY_CACHED(l) != KEY_CACHED(r) ||
- KEY_VERSION(l) != KEY_VERSION(r) ||
- KEY_CSUM(l) != KEY_CSUM(r) ||
- bkey_cmp(l, &START_KEY(r)))
+ if (!bch_bkey_equal_header(l, r) ||
+ bkey_cmp(l, &START_KEY(r)))
return false;
return b->ops->key_merge(b, l, r);