From 93f9f77f24c7b79e26a4b836191259c1469a9163 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Mar 2009 19:32:51 -0700
Subject: [PATCH] --- yaml --- r: 132256 b: refs/heads/master c:
 aa8e4fc68d8024cd3132035d13c3cefa7baeac8f h: refs/heads/master v: v3

---
 [refs]             |  2 +-
 trunk/lib/bitmap.c | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index bcb925f99cfd..e8323c2252c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ead64974b05501bbac0d63a47c99fa786d064ba
+refs/heads/master: aa8e4fc68d8024cd3132035d13c3cefa7baeac8f
diff --git a/trunk/lib/bitmap.c b/trunk/lib/bitmap.c
index 1338469ac849..35a1f7ff4149 100644
--- a/trunk/lib/bitmap.c
+++ b/trunk/lib/bitmap.c
@@ -948,15 +948,15 @@ static int __reg_op(unsigned long *bitmap, int pos, int order, int reg_op)
  */
 int bitmap_find_free_region(unsigned long *bitmap, int bits, int order)
 {
-	int pos;		/* scans bitmap by regions of size order */
+	int pos, end;		/* scans bitmap by regions of size order */
 
-	for (pos = 0; pos < bits; pos += (1 << order))
-		if (__reg_op(bitmap, pos, order, REG_OP_ISFREE))
-			break;
-	if (pos == bits)
-		return -ENOMEM;
-	__reg_op(bitmap, pos, order, REG_OP_ALLOC);
-	return pos;
+	for (pos = 0 ; (end = pos + (1 << order)) <= bits; pos = end) {
+		if (!__reg_op(bitmap, pos, order, REG_OP_ISFREE))
+			continue;
+		__reg_op(bitmap, pos, order, REG_OP_ALLOC);
+		return pos;
+	}
+	return -ENOMEM;
 }
 EXPORT_SYMBOL(bitmap_find_free_region);