svn commit: r355084 - head/sys/vm

[Ryan Libby]

Author: rlibby
Date: Mon Nov 25 07:38:31 2019
New Revision: 355084
URL: https://svnweb.freebsd.org/changeset/base/355084

Log:
  vm_object_collapse_scan_wait: drop locks before reacquiring
  
  Regression from r352174.  In the vm_page_rename() failure case we forgot
  to unlock the vm object locks before sleeping and reacquiring them.
  
  Reviewed by:	jeff
  Sponsored by:	Dell EMC Isilon
  Differential Revision:	https://reviews.freebsd.org/D22542

Modified:
  head/sys/vm/vm_object.c

Modified: head/sys/vm/vm_object.c
==============================================================================
--- head/sys/vm/vm_object.c	Mon Nov 25 07:38:27 2019	(r355083)
+++ head/sys/vm/vm_object.c	Mon Nov 25 07:38:31 2019	(r355084)
@@ -1496,6 +1496,8 @@ vm_object_collapse_scan_wait(vm_object_t object, vm_pa
 		return (next);
 	/* The page is only NULL when rename fails. */
 	if (p == NULL) {
+		VM_OBJECT_WUNLOCK(object);
+		VM_OBJECT_WUNLOCK(backing_object);
 		vm_radix_wait();
 	} else {
 		if (p->object == object)