From 1e62dec29b9774308a2011a41e06aecb1811d424 Mon Sep 17 00:00:00 2001 From: truckman Date: Thu, 22 May 2014 00:39:49 +0000 Subject: [PATCH] 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. git-svn-id: svn://svn.freebsd.org/base/stable/10@266521 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/kern/subr_rman.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/sys/kern/subr_rman.c b/sys/kern/subr_rman.c index 4101c867a..5ae96e981 100644 --- a/sys/kern/subr_rman.c +++ b/sys/kern/subr_rman.c @@ -602,13 +602,10 @@ rman_reserve_resource_bound(struct rman *rm, u_long start, u_long end, 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); -- 2.45.0