xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcache: update bch_bkey_try_merge

Browse Source 
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>
This commit is contained in:
Nicholas Swenson
2013-10-14 18:53:16 -07:00
committed by Kent Overstreet
parent 829a60b905
commit 0f49cf3d83
3 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/md/bcache/bset.c
View File

@@ -773,6 +773,33 @@ static void bch_bset_fix_lookup_table(struct btree_keys *b,
}
}
/*
* 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.
*/
bool bch_bkey_try_merge(struct btree_keys *b, struct bkey *l, struct bkey *r)
{
if (!b->ops->key_merge)
return false;
/*
* Generic header checks
* 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)))
return false;
return b->ops->key_merge(b, l, r);
}
EXPORT_SYMBOL(bch_bkey_try_merge);
void bch_bset_insert(struct btree_keys *b, struct bkey *where,
struct bkey *insert)
{