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

Report device size correctly in --detail for Large devices. 

Signed-off-by: Neil Brown <neilb@suse.de>
This commit is contained in:
Neil Brown 2006-01-30 23:42:53 +00:00
parent 8fac0577f0
commit 6ee5c05a11
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Detail.c
View File

@ -166,9 +166,13 @@ int Detail(char *dev, int brief, int test)
printf(" Array Size : %llu%s\n", (larray_size>>10), human_size(larray_size));
if (array.level >= 1) {
if (array.major_version != 0 &&
larray_size >= 0xFFFFFFFFULL)
printf(" Device Size : unknown\n");
else
(larray_size >= 0xFFFFFFFFULL|| array.size == 0)) {
unsigned long long dsize = get_component_size(fd);
if (dsize > 0)
printf(" Device Size : %llu%s\n", dsize, human_size((long long)array.size<<10));
else
printf(" Device Size : unknown\n");
} else
printf(" Device Size : %d%s\n", array.size, human_size((long long)array.size<<10));
}
printf(" Raid Devices : %d\n", array.raid_disks);

4
util.c
View File

@ -688,10 +688,10 @@ unsigned long long get_component_size(int fd)
int n;
if (fstat(fd, &stb)) return 0;
if (major(stb.st_rdev) == 9)
sprintf(fname, "/sys/block/md%d/component_size",
sprintf(fname, "/sys/block/md%d/md/component_size",
minor(stb.st_rdev));
else
sprintf(fname, "/sys/block/md_d%d/component_size",
sprintf(fname, "/sys/block/md_d%d/md/component_size",
minor(stb.st_rdev)/16);
fd = open(fname, O_RDONLY);
if (fd < 0)