From c005b04c2829538c6dc2464f17c14a2594dd6023 Mon Sep 17 00:00:00 2001 From: markj Date: Tue, 13 Nov 2018 17:43:16 +0000 Subject: [PATCH] MFC r340331: Re-apply r336984, reverting r339934. Approved by: re (gjb) --- sys/vm/vm_object.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 7a92301d318..578bcd76007 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2143,8 +2143,9 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, next_size >>= PAGE_SHIFT; next_pindex = OFF_TO_IDX(prev_offset) + prev_size; - if ((prev_object->ref_count > 1) && - (prev_object->size != next_pindex)) { + if (prev_object->ref_count > 1 && + prev_object->size != next_pindex && + (prev_object->flags & OBJ_ONEMAPPING) == 0) { VM_OBJECT_WUNLOCK(prev_object); return (FALSE); } -- 2.45.0