diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-21 10:12:39 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-21 10:12:39 -0400 |
| commit | b3f87b98aa3dc22cc58f970140113b270015cddb (patch) | |
| tree | c4aec5996567ad96310f61e9244e799f41bf2625 /drivers/md/bitmap.c | |
| parent | 041245c88a29273788e8eff1353bc6e1f56c61df (diff) | |
| parent | 1afeaf5c29aa07db25760d2fbed5c08a3aec3498 (diff) | |
Merge branch 'bugfixes' into nfs-for-next
Diffstat (limited to 'drivers/md/bitmap.c')
| -rw-r--r-- | drivers/md/bitmap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index 97e73e555d11..17e2b472e16d 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c | |||
| @@ -1727,8 +1727,7 @@ int bitmap_create(struct mddev *mddev) | |||
| 1727 | bitmap->chunkshift = (ffz(~mddev->bitmap_info.chunksize) | 1727 | bitmap->chunkshift = (ffz(~mddev->bitmap_info.chunksize) |
| 1728 | - BITMAP_BLOCK_SHIFT); | 1728 | - BITMAP_BLOCK_SHIFT); |
| 1729 | 1729 | ||
| 1730 | /* now that chunksize and chunkshift are set, we can use these macros */ | 1730 | chunks = (blocks + (1 << bitmap->chunkshift) - 1) >> |
| 1731 | chunks = (blocks + bitmap->chunkshift - 1) >> | ||
| 1732 | bitmap->chunkshift; | 1731 | bitmap->chunkshift; |
| 1733 | pages = (chunks + PAGE_COUNTER_RATIO - 1) / PAGE_COUNTER_RATIO; | 1732 | pages = (chunks + PAGE_COUNTER_RATIO - 1) / PAGE_COUNTER_RATIO; |
| 1734 | 1733 | ||