svn commit: r308109 - head/sys/vm

[Konstantin Belousov]

Author: kib
Date: Sun Oct 30 18:05:18 2016
New Revision: 308109
URL: https://svnweb.freebsd.org/changeset/base/308109

Log:
  Remove vnode_locked label and goto, by collapsing vp calculation into
  the conditional.
  
  Suggested and reviewed by:	alc
  Sponsored by:	The FreeBSD Foundation
  MFC after:	1 week

Modified:
  head/sys/vm/vm_fault.c

Modified: head/sys/vm/vm_fault.c
==============================================================================
--- head/sys/vm/vm_fault.c	Sun Oct 30 18:04:11 2016	(r308108)
+++ head/sys/vm/vm_fault.c	Sun Oct 30 18:05:18 2016	(r308109)
@@ -641,10 +641,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);
 
@@ -667,7 +665,6 @@ readrest:
 				}
 				fs.vp = vp;
 			}
-vnode_locked:
 			KASSERT(fs.vp == NULL || !fs.map->system_map,
 			    ("vm_fault: vnode-backed object mapped by system map"));