Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Jul 2019 19:17:55 +0000 (UTC)
From:      Doug Moore <dougm@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r349744 - head/sys/vm
Message-ID:  <201907041917.x64JHt2V018159@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dougm
Date: Thu Jul  4 19:17:55 2019
New Revision: 349744
URL: https://svnweb.freebsd.org/changeset/base/349744

Log:
  Replace a 'goto' with an 'else' in vm_map_wire_locked.
  
  Reviewed by: alc
  Approved by: markj (mentor)
  Differential Revision:	https://reviews.freebsd.org/D20855

Modified:
  head/sys/vm/vm_map.c

Modified: head/sys/vm/vm_map.c
==============================================================================
--- head/sys/vm/vm_map.c	Thu Jul  4 19:12:13 2019	(r349743)
+++ head/sys/vm/vm_map.c	Thu Jul  4 19:17:55 2019	(r349744)
@@ -3280,10 +3280,9 @@ done:
 			continue;
 		}
 
-		if ((entry->eflags & MAP_ENTRY_WIRE_SKIPPED) != 0)
-			goto next_entry_done;
-
-		if (rv == KERN_SUCCESS) {
+		if ((entry->eflags & MAP_ENTRY_WIRE_SKIPPED) != 0) {
+			/* do nothing */
+		} else if (rv == KERN_SUCCESS) {
 			if (user_wire)
 				entry->eflags |= MAP_ENTRY_USER_WIRED;
 		} else if (entry->wired_count == -1) {
@@ -3306,7 +3305,6 @@ done:
 			} else
 				entry->wired_count--;
 		}
-	next_entry_done:
 		KASSERT((entry->eflags & MAP_ENTRY_IN_TRANSITION) != 0,
 		    ("vm_map_wire: in-transition flag missing %p", entry));
 		KASSERT(entry->wiring_thread == curthread,



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907041917.x64JHt2V018159>