Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 19 May 2014 04:44:28 +0000 (UTC)
From:      Don Lewis <truckman@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r266426 - head/sys/kern
Message-ID:  <201405190444.s4J4iSgD001476@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: truckman
Date: Mon May 19 04:44:27 2014
New Revision: 266426
URL: http://svnweb.freebsd.org/changeset/base/266426

Log:
  Slightly restructure the final loop in rman_reserve_resource_bound().
  Replace with the existing loop termination test with a similar
  condition from the nested "if" that may terminate the loop a bit
  sooner, but still not too early.   This condition can then be removed
  from the nested "if".  Relocate an operator to be style(9) compliant.
  
  MFC after:	3 days

Modified:
  head/sys/kern/subr_rman.c

Modified: head/sys/kern/subr_rman.c
==============================================================================
--- head/sys/kern/subr_rman.c	Mon May 19 04:40:02 2014	(r266425)
+++ head/sys/kern/subr_rman.c	Mon May 19 04:44:27 2014	(r266426)
@@ -602,13 +602,10 @@ rman_reserve_resource_bound(struct rman 
 	if ((flags & (RF_SHAREABLE | RF_TIMESHARE)) == 0)
 		goto out;
 
-	for (s = r; s; s = TAILQ_NEXT(s, r_link)) {
-		if (s->r_start > end)
-			break;
-		if ((s->r_flags & flags) != flags)
-			continue;
-		if (s->r_start >= start && s->r_end <= end
-		    && (s->r_end - s->r_start + 1) == count &&
+	for (s = r; s && s->r_end <= end; s = TAILQ_NEXT(s, r_link)) {
+		if ((s->r_flags & flags) == flags &&
+		    s->r_start >= start &&
+		    (s->r_end - s->r_start + 1) == count &&
 		    (s->r_start & amask) == 0 &&
 		    ((s->r_start ^ s->r_end) & bmask) == 0) {
 			rv = int_alloc_resource(M_NOWAIT);



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