From 25f2a29861b411096bc7cadb82925d086561a82a Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 22 May 2012 13:55:25 +1000 Subject: [PATCH] --- yaml --- r: 305954 b: refs/heads/master c: 15702d7fb6e7a6baf5a04286a227b0ad2fe4a03f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/bitmap.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 82540d654d79..e3eed8df2db1 100644 --- 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 index c100a47bc157..bc552bbad83e 100644 --- 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);