diff options
| author | Goldwyn Rodrigues <rgoldwyn@suse.de> | 2015-03-24 17:29:05 +0100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2015-03-25 03:07:55 +0100 |
| commit | 124eb761edfdee13c02e48815b05d9bed7666d4c (patch) | |
| tree | 4bcfdac47a47a12a5b15c8d4b86a3bc91403e6eb /drivers/md/bitmap.c | |
| parent | md/cluster: Communication Framework: fix semicolon.cocci warnings (diff) | |
| download | linux-124eb761edfdee13c02e48815b05d9bed7666d4c.tar.xz linux-124eb761edfdee13c02e48815b05d9bed7666d4c.zip | |
md: Fix bitmap offset calculations
The calculations of bitmap offset is incorrect with respect to bits to bytes
conversion.
Also, remove an irrelevant duplicate message.
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/bitmap.c')
| -rw-r--r-- | drivers/md/bitmap.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index ac79fef68143..e98db04eb4f9 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c @@ -575,7 +575,9 @@ re_read: sector_div(bm_blocks, bitmap->mddev->bitmap_info.chunksize >> 9); - bm_blocks = bm_blocks << 3; + /* bits to bytes */ + bm_blocks = ((bm_blocks+7) >> 3) + sizeof(bitmap_super_t); + /* to 4k blocks */ bm_blocks = DIV_ROUND_UP_SECTOR_T(bm_blocks, 4096); bitmap->mddev->bitmap_info.offset += bitmap->cluster_slot * (bm_blocks << 3); pr_info("%s:%d bm slot: %d offset: %llu\n", __func__, __LINE__, @@ -672,9 +674,6 @@ out: goto out_no_sb; } bitmap->cluster_slot = md_cluster_ops->slot_number(bitmap->mddev); - pr_info("%s:%d bm slot: %d offset: %llu\n", __func__, __LINE__, - bitmap->cluster_slot, - (unsigned long long)bitmap->mddev->bitmap_info.offset); goto re_read; } |