Stop checking head state in the merge hook.
Now that all merging go through try_acquire_edata_neighbor, the mergeablility checks (including head state checking) are done before reaching the merge hook. In other words, merge hook will never be called if the head state doesn't agree.
This commit is contained in:
+2
-2
@@ -1189,8 +1189,8 @@ extent_merge_impl(tsdn_t *tsdn, pac_t *pac, ehooks_t *ehooks, edata_t *a,
|
||||
emap_assert_mapped(tsdn, pac->emap, b);
|
||||
|
||||
bool err = ehooks_merge(tsdn, ehooks, edata_base_get(a),
|
||||
edata_size_get(a), edata_is_head_get(a), edata_base_get(b),
|
||||
edata_size_get(b), edata_is_head_get(b), edata_committed_get(a));
|
||||
edata_size_get(a), edata_base_get(b), edata_size_get(b),
|
||||
edata_committed_get(a));
|
||||
|
||||
if (err) {
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user