svn commit: r334287 - head/sys/vm

[Alan Cox]

Author: alc
Date: Mon May 28 16:23:39 2018
New Revision: 334287
URL: https://svnweb.freebsd.org/changeset/base/334287

Log:
  Addendum to r334233.  In vm_fault_populate(), since the page lock is held,
  we must use vm_page_xunbusy_maybelocked() rather than vm_page_xunbusy() to
  unbusy the page.
  
  Reviewed by:	kib
  X-MFC with:	r334233

Modified:
  head/sys/vm/vm_fault.c

Modified: head/sys/vm/vm_fault.c
==============================================================================
--- head/sys/vm/vm_fault.c	Mon May 28 13:31:47 2018	(r334286)
+++ head/sys/vm/vm_fault.c	Mon May 28 16:23:39 2018	(r334287)
@@ -490,7 +490,7 @@ vm_fault_populate(struct faultstate *fs, vm_prot_t pro
 				*m_hold = &m[i];
 				vm_page_hold(&m[i]);
 			}
-			vm_page_xunbusy(&m[i]);
+			vm_page_xunbusy_maybelocked(&m[i]);
 		}
 		if (m_mtx != NULL)
 			mtx_unlock(m_mtx);