---

yaml --- r: 305954 b: refs/heads/master c: 15702d7 h: refs/heads/master v: v3
git-mirror · May 22, 2012 · 25f2a29 · 25f2a29
1 parent b87c192
commit 25f2a29
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40cffcc0e8f9f6e295630cb8b8d58a13baa6c7f9
+refs/heads/master: 15702d7fb6e7a6baf5a04286a227b0ad2fe4a03f
diff --git a/trunk/drivers/md/bitmap.c b/trunk/drivers/md/bitmap.c
@@ -1694,9 +1694,8 @@ int bitmap_create(struct mddev *mddev)
 	bitmap->counts.chunkshift = (ffz(~mddev->bitmap_info.chunksize)
 			      - BITMAP_BLOCK_SHIFT);
 
-	chunks = (blocks + (1 << bitmap->counts.chunkshift) - 1) >>
-			bitmap->counts.chunkshift;
-	pages = (chunks + PAGE_COUNTER_RATIO - 1) / PAGE_COUNTER_RATIO;
+	chunks = DIV_ROUND_UP_SECTOR_T(blocks, 1 << bitmap->counts.chunkshift);
+	pages = DIV_ROUND_UP(chunks, PAGE_COUNTER_RATIO);
 
 	BUG_ON(!pages);