diff options
| author |   Nicholas Swenson <nks@daterainc.com> | 2013-10-14 18:53:16 -0700 |
|---|---|---|
| committer |   Kent Overstreet <kmo@daterainc.com> | 2014-01-08 13:05:14 -0800 |
| commit | 0f49cf3d83fbf038534c9302095b66b07b9838c3 (patch) | |
| tree | 539bb39097a9e06b998be0586bd47dd385f02bab /drivers/md/bcache/extents.c | |
| parent | bcache: Move insert_fixup() to btree_keys_ops (diff) | |
| download | linux-dev-0f49cf3d83fbf038534c9302095b66b07b9838c3.tar.xz linux-dev-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/extents.c')
| -rw-r--r-- | drivers/md/bcache/extents.c | 5 |
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 if (key_merging_disabled(b->c)) return false; - if (KEY_PTRS(l) != KEY_PTRS(r) || - KEY_DIRTY(l) != KEY_DIRTY(r) || - bkey_cmp(l, &START_KEY(r))) - return false; - for (i = 0; i < KEY_PTRS(l); i++) if (l->ptr[i] + PTR(0, KEY_SIZE(l), 0) != r->ptr[i] || PTR_BUCKET_NR(b->c, l, i) != PTR_BUCKET_NR(b->c, r, i)) |