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

Query: Use sysfs to obtain data if possible 

Use sysfs to obtain leve, raid_disks, and spare_disks. If sysfs fails,
fall back to calling the ioctl via md_get_array_info().

Signed-off-by: Jes Sorensen <jsorensen@fb.com>
This commit is contained in:
Jes Sorensen 2017-04-13 12:20:46 -04:00
parent 8d0cd09d73
commit f22d6cde7c
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Query.c
View File

@ -35,7 +35,9 @@ int Query(char *dev)
int fd;
int ioctlerr, staterr;
int superror;
int level, raid_disks, spare_disks;
struct mdinfo info;
struct mdinfo *sra;
mdu_array_info_t array;
struct supertype *st = NULL;
unsigned long long larray_size;
@ -50,16 +52,28 @@ int Query(char *dev)
return 1;
}
if (md_get_array_info(fd, &array) < 0)
ioctlerr = errno;
else
ioctlerr = 0;
if (fstat(fd, &stb) < 0)
staterr = errno;
else
staterr = 0;
ioctlerr = 0;
sra = sysfs_read(fd, dev, GET_DISKS | GET_LEVEL | GET_DEVS | GET_STATE);
if (sra) {
level = sra->array.level;
raid_disks = sra->array.raid_disks;
spare_disks = sra->array.spare_disks;
} else {
if (md_get_array_info(fd, &array) < 0) {
ioctlerr = errno;
} else {
level = array.level;
raid_disks = array.raid_disks;
spare_disks = array.spare_disks;
}
}
if (!ioctlerr && !staterr) {
if (!get_dev_size(fd, NULL, &larray_size))
larray_size = 0;
@ -75,11 +89,9 @@ int Query(char *dev)
dev, strerror(ioctlerr));
else {
printf("%s: %s %s %d devices, %d spare%s. Use mdadm --detail for more detail.\n",
dev,
human_size_brief(larray_size,IEC),
map_num(pers, array.level),
array.raid_disks,
array.spare_disks, array.spare_disks==1?"":"s");
dev, human_size_brief(larray_size,IEC),
map_num(pers, level), raid_disks,
spare_disks, spare_disks == 1 ? "" : "s");
}
st = guess_super(fd);
if (st && st->ss->compare_super != NULL)