svn commit: r308361 - stable/11/sys/vm

[Konstantin Belousov]

Author: kib
Date: Sun Nov  6 12:49:15 2016
New Revision: 308361
URL: https://svnweb.freebsd.org/changeset/base/308361

Log:
  MFC r308109:
  Remove vnode_locked label and goto.

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

Modified: stable/11/sys/vm/vm_fault.c
==============================================================================
--- stable/11/sys/vm/vm_fault.c	Sun Nov  6 12:45:19 2016	(r308360)
+++ stable/11/sys/vm/vm_fault.c	Sun Nov  6 12:49:15 2016	(r308361)
@@ -640,10 +640,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);
 
@@ -666,7 +664,6 @@ readrest:
 				}
 				fs.vp = vp;
 			}
-vnode_locked:
 			KASSERT(fs.vp == NULL || !fs.map->system_map,
 			    ("vm_fault: vnode-backed object mapped by system map"));