aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/bcache/extents.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/md/bcache/extents.c')
-rw-r--r--drivers/md/bcache/extents.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/md/bcache/extents.c b/drivers/md/bcache/extents.c
index d6de3c76a87b..7d73d8625522 100644
--- a/drivers/md/bcache/extents.c
+++ b/drivers/md/bcache/extents.c
@@ -575,11 +575,6 @@ static bool bch_extent_merge(struct btree_keys *bk, struct bkey *l, struct bkey
575 if (key_merging_disabled(b->c)) 575 if (key_merging_disabled(b->c))
576 return false; 576 return false;
577 577
578 if (KEY_PTRS(l) != KEY_PTRS(r) ||
579 KEY_DIRTY(l) != KEY_DIRTY(r) ||
580 bkey_cmp(l, &START_KEY(r)))
581 return false;
582
583 for (i = 0; i < KEY_PTRS(l); i++) 578 for (i = 0; i < KEY_PTRS(l); i++)
584 if (l->ptr[i] + PTR(0, KEY_SIZE(l), 0) != r->ptr[i] || 579 if (l->ptr[i] + PTR(0, KEY_SIZE(l), 0) != r->ptr[i] ||
585 PTR_BUCKET_NR(b->c, l, i) != PTR_BUCKET_NR(b->c, r, i)) 580 PTR_BUCKET_NR(b->c, l, i) != PTR_BUCKET_NR(b->c, r, i))