diff options
| author | NeilBrown <neilb@suse.de> | 2009-04-20 11:50:24 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2009-04-20 11:50:24 +1000 |
| commit | 1f59390339f263c0fe7908fbe54466dbf3a64b58 (patch) | |
| tree | 334f287c819c1876f29cd5833222eacd910e0ada /drivers/md | |
| parent | c03f6a19699fce4389888a45db8245969311d868 (diff) | |
| download | linux-stable-1f59390339f263c0fe7908fbe54466dbf3a64b58.tar.gz linux-stable-1f59390339f263c0fe7908fbe54466dbf3a64b58.tar.bz2 linux-stable-1f59390339f263c0fe7908fbe54466dbf3a64b58.zip | |
md: support bitmaps on RAID10 arrays larger then 2 terabytes
.. and other arrays with components larger than 2 terabytes.
We use a "long" rather than a "sector_t" in part of the bitmap
size calculations, which is sad.
Reported-by: "Mario 'BitKoenig' Holbe" <Mario.Holbe@TU-Ilmenau.DE>
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/bitmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index e4510c976b34..1fb91edc7de2 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c @@ -1590,7 +1590,7 @@ void bitmap_destroy(mddev_t *mddev) int bitmap_create(mddev_t *mddev) { struct bitmap *bitmap; - unsigned long blocks = mddev->resync_max_sectors; + sector_t blocks = mddev->resync_max_sectors; unsigned long chunks; unsigned long pages; struct file *file = mddev->bitmap_file; @@ -1632,8 +1632,8 @@ int bitmap_create(mddev_t *mddev) bitmap->chunkshift = ffz(~bitmap->chunksize); /* now that chunksize and chunkshift are set, we can use these macros */ - chunks = (blocks + CHUNK_BLOCK_RATIO(bitmap) - 1) / - CHUNK_BLOCK_RATIO(bitmap); + chunks = (blocks + CHUNK_BLOCK_RATIO(bitmap) - 1) >> + CHUNK_BLOCK_SHIFT(bitmap); pages = (chunks + PAGE_COUNTER_RATIO - 1) / PAGE_COUNTER_RATIO; BUG_ON(!pages); |