From cdd02f43b9689ef4a75bb609b7c0a36a0cc545c3 Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Fri, 19 Jun 2020 11:04:49 +0000 Subject: [PATCH] Revert r362360. This commit was simply wrong since two different objects are locked. Reported by: lwhsu, pho Pointy hat: markj --- sys/vm/vm_object.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index b2897e367349..4e27327ef42b 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -864,6 +864,7 @@ vm_object_backing_collapse_wait(vm_object_t object) VM_OBJECT_WLOCK(backing_object); if ((backing_object->flags & (OBJ_DEAD | OBJ_COLLAPSING)) == 0) break; + VM_OBJECT_WUNLOCK(object); vm_object_pip_sleep(backing_object, "vmbckwait"); counter_u64_add(object_collapse_waits, 1); VM_OBJECT_WLOCK(object);