summaryrefslogtreecommitdiffstats
path: root/sys/vm
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2015-05-05 08:12:24 +0000
committerkib <kib@FreeBSD.org>2015-05-05 08:12:24 +0000
commitae13a0da650603eb50dbcd13fdc59a56951c94c6 (patch)
tree0e708b307d7c86d3f11bfba8bdd26a7635a3b43f /sys/vm
parentf0172891ff86f3a5d43749d33f76c59dd583ba55 (diff)
downloadFreeBSD-src-ae13a0da650603eb50dbcd13fdc59a56951c94c6.zip
FreeBSD-src-ae13a0da650603eb50dbcd13fdc59a56951c94c6.tar.gz
MFC r282128:
Do not sleep waiting for the MAP_ENTRY_IN_TRANSITION state ending with the vnode locked.
Diffstat (limited to 'sys/vm')
-rw-r--r--sys/vm/vm_fault.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index 4311fe8..0c111da 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -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
OpenPOWER on IntegriCloud