summaryrefslogtreecommitdiffstats
path: root/sys/vm/vm_fault.c
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2015-04-28 08:20:23 +0000
committerkib <kib@FreeBSD.org>2015-04-28 08:20:23 +0000
commitdfce070d88c9afeca115a00e1f023cf5d70836fc (patch)
treeb776edabdf7aeff7e2a40b3c182c47175563257a /sys/vm/vm_fault.c
parent65773effb924fc3b36d0b38bd76b8a94ced0edd5 (diff)
downloadFreeBSD-src-dfce070d88c9afeca115a00e1f023cf5d70836fc.zip
FreeBSD-src-dfce070d88c9afeca115a00e1f023cf5d70836fc.tar.gz
Do not sleep waiting for the MAP_ENTRY_IN_TRANSITION state ending with
the vnode locked. Review: https://reviews.freebsd.org/D2381 Submitted by: Conrad Meyer, Attilio Rao MFC after: 1 week
Diffstat (limited to 'sys/vm/vm_fault.c')
-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 13f46e1..0c84d44 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -348,6 +348,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