Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

imsm: show correct size for arrays with 4k disks 

Number of blocks used to calculate array size is based on 512 block size
so the size displayed is incorrect for arrays with 4k disks.

Signed-off-by: Maksymilian Kunt <maksymilian.kunt@intel.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>
This commit is contained in:
Maksymilian Kunt 2017-01-09 15:16:04 +01:00 committed by Jes Sorensen
parent 4515fb28a5
commit ef5c214e4f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
super-intel.c
View File

@ -1480,8 +1480,10 @@ static void print_imsm_dev(struct intel_super *super,
printf(" Dirty State : %s\n", dev->vol.dirty ? "dirty" : "clean");
}
static void print_imsm_disk(struct imsm_disk *disk, int index, __u32 reserved)
{
static void print_imsm_disk(struct imsm_disk *disk,
int index,
__u32 reserved,
unsigned int sector_size) {
char str[MAX_RAID_SERIAL_LEN + 1];
__u64 sz;
@ -1499,7 +1501,8 @@ static void print_imsm_disk(struct imsm_disk *disk, int index, __u32 reserved)
is_failed(disk) ? " failed" : "");
printf(" Id : %08x\n", __le32_to_cpu(disk->scsi_id));
sz = total_blocks(disk) - reserved;
printf(" Usable Size : %llu%s\n", (unsigned long long)sz,
printf(" Usable Size : %llu%s\n",
(unsigned long long)sz * 512 / sector_size,
human_size(sz * 512));
}
@ -1829,7 +1832,8 @@ static void examine_super_imsm(struct supertype *st, char *homehost)
printf(" MPB Sectors : %d\n", mpb_sectors(mpb, super->sector_size));
printf(" Disks : %d\n", mpb->num_disks);
printf(" RAID Devices : %d\n", mpb->num_raid_devs);
print_imsm_disk(__get_imsm_disk(mpb, super->disks->index), super->disks->index, reserved);
print_imsm_disk(__get_imsm_disk(mpb, super->disks->index),
super->disks->index, reserved, super->sector_size);
if (get_imsm_bbm_log_size(super->bbm_log)) {
struct bbm_log *log = super->bbm_log;
@ -1851,12 +1855,14 @@ static void examine_super_imsm(struct supertype *st, char *homehost)
for (i = 0; i < mpb->num_disks; i++) {
if (i == super->disks->index)
continue;
print_imsm_disk(__get_imsm_disk(mpb, i), i, reserved);
print_imsm_disk(__get_imsm_disk(mpb, i), i, reserved,
super->sector_size);
}
for (dl = super->disks; dl; dl = dl->next)
if (dl->index == -1)
print_imsm_disk(&dl->disk, -1, reserved);
print_imsm_disk(&dl->disk, -1, reserved,
super->sector_size);
examine_migr_rec_imsm(super);
}