Author: kib
Date: Sun Nov 6 13:35:20 2016
New Revision: 308364
URL: https://svnweb.freebsd.org/changeset/base/308364
Log:
MFC r308109:
Remove vnode_locked label and goto.
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 Sun Nov 6 12:56:07 2016 (r308363)
+++ stable/10/sys/vm/vm_fault.c Sun Nov 6 13:35:20 2016 (r308364)
@@ -627,10 +627,8 @@ readrest:
*/
unlock_map(&fs);
- if (fs.object->type == OBJT_VNODE) {
- vp = fs.object->handle;
- if (vp == fs.vp)
- goto vnode_locked;
+ if (fs.object->type == OBJT_VNODE &&
+ (vp = fs.object->handle) != fs.vp) {
unlock_vp(&fs);
locked = VOP_ISLOCKED(vp);
@@ -653,7 +651,6 @@ readrest:
}
fs.vp = vp;
}
-vnode_locked:
KASSERT(fs.vp == NULL || !fs.map->system_map,
("vm_fault: vnode-backed object mapped by system
map"));
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
