diff options
Diffstat (limited to 'drivers/md/bcache/bset.c')
-rw-r--r-- | drivers/md/bcache/bset.c | 8 |
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) | |||
788 | * Assumes left and right are in order | 788 | * Assumes left and right are in order |
789 | * Left and right must be exactly aligned | 789 | * Left and right must be exactly aligned |
790 | */ | 790 | */ |
791 | if (KEY_U64s(l) != KEY_U64s(r) || | 791 | if (!bch_bkey_equal_header(l, r) || |
792 | KEY_DELETED(l) != KEY_DELETED(r) || | 792 | bkey_cmp(l, &START_KEY(r))) |
793 | KEY_CACHED(l) != KEY_CACHED(r) || | ||
794 | KEY_VERSION(l) != KEY_VERSION(r) || | ||
795 | KEY_CSUM(l) != KEY_CSUM(r) || | ||
796 | bkey_cmp(l, &START_KEY(r))) | ||
797 | return false; | 793 | return false; |
798 | 794 | ||
799 | return b->ops->key_merge(b, l, r); | 795 | return b->ops->key_merge(b, l, r); |