diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-03-03 03:35:31 +0100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2015-03-04 03:08:16 +0100 |
| commit | 3b0e6aacbfe04fa144c4732f269b09ce91177566 (patch) | |
| tree | 8ebbb494eec91dd732fd6e8b923b212da09f9740 /drivers/md | |
| parent | md/bitmap: fix incorrect DIV_ROUND_UP usage. (diff) | |
| download | linux-3b0e6aacbfe04fa144c4732f269b09ce91177566.tar.xz linux-3b0e6aacbfe04fa144c4732f269b09ce91177566.zip | |
md/bitmap: use sector_div for sector_t divisions
neilb: modified to not corrupt ->resync_max_sectors.
sector_div usage fixed by Guoqing Jiang <gqjiang@suse.com>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/bitmap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index 03e0752af99f..ac79fef68143 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c @@ -571,9 +571,10 @@ static int bitmap_read_sb(struct bitmap *bitmap) re_read: /* If cluster_slot is set, the cluster is setup */ if (bitmap->cluster_slot >= 0) { - sector_t bm_blocks; + sector_t bm_blocks = bitmap->mddev->resync_max_sectors; - bm_blocks = bitmap->mddev->resync_max_sectors / (bitmap->mddev->bitmap_info.chunksize >> 9); + sector_div(bm_blocks, + bitmap->mddev->bitmap_info.chunksize >> 9); bm_blocks = bm_blocks << 3; bm_blocks = DIV_ROUND_UP_SECTOR_T(bm_blocks, 4096); bitmap->mddev->bitmap_info.offset += bitmap->cluster_slot * (bm_blocks << 3); |