svn commit: r282456 - stable/10/sys/vm

[Konstantin Belousov]

Author: kib
Date: Tue May  5 08:12:24 2015
New Revision: 282456
URL: https://svnweb.freebsd.org/changeset/base/282456

Log:
  MFC r282128:
  Do not sleep waiting for the MAP_ENTRY_IN_TRANSITION state ending with
  the vnode locked.

Modified:
  stable/10/sys/vm/vm_fault.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/vm/vm_fault.c
==============================================================================
--- stable/10/sys/vm/vm_fault.c	Tue May  5 07:52:41 2015	(r282455)
+++ stable/10/sys/vm/vm_fault.c	Tue May  5 08:12:24 2015	(r282456)
@@ -345,6 +345,10 @@ RetryFault:;
 		vm_map_lock(fs.map);
 		if (vm_map_lookup_entry(fs.map, vaddr, &fs.entry) &&
 		    (fs.entry->eflags & MAP_ENTRY_IN_TRANSITION)) {
+			if (fs.vp != NULL) {
+				vput(fs.vp);
+				fs.vp = NULL;
+			}
 			fs.entry->eflags |= MAP_ENTRY_NEEDS_WAKEUP;
 			vm_map_unlock_and_wait(fs.map, 0);
 		} else