svn commit: r266521 - stable/10/sys/kern

[Don Lewis]

Author: truckman
Date: Thu May 22 00:39:49 2014
New Revision: 266521
URL: http://svnweb.freebsd.org/changeset/base/266521

Log:
  MFC r266426
  
  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.

Modified:
  stable/10/sys/kern/subr_rman.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/subr_rman.c
==============================================================================
--- stable/10/sys/kern/subr_rman.c	Thu May 22 00:01:31 2014	(r266520)
+++ stable/10/sys/kern/subr_rman.c	Thu May 22 00:39:49 2014	(r266521)
@@ -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);