X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Query.c;h=d2bfb0524672cacab8ed31add6ca5480afbb376a;hp=4c2c7bff00ed9369182b4a0ac369bcbc7be3e2b9;hb=fbf8a0b7a6f107c0fcecb6fea5640ffb1bc0d9c2;hpb=bea93430e8b9327688fa9f6d5220d9250546a292 diff --git a/Query.c b/Query.c index 4c2c7bff..d2bfb052 100644 --- a/Query.c +++ b/Query.c @@ -105,26 +105,31 @@ int Query(char *dev) if (superror == 0) { /* array might be active... */ st->ss->getinfo_super(&info, super); - mddev = get_md_name(info.array.md_minor); - disc.number = info.disk.number; - activity = "undetected"; - if (mddev && (fd = open(mddev, O_RDONLY))>=0) { - if (md_get_version(fd) >= 9000 && - ioctl(fd, GET_ARRAY_INFO, &array)>= 0) { - if (ioctl(fd, GET_DISK_INFO, &disc) >= 0 && - makedev((unsigned)disc.major,(unsigned)disc.minor) == stb.st_rdev) - activity = "active"; - else - activity = "mismatch"; + if (st->ss->major == 0) { + mddev = get_md_name(info.array.md_minor); + disc.number = info.disk.number; + activity = "undetected"; + if (mddev && (fd = open(mddev, O_RDONLY))>=0) { + if (md_get_version(fd) >= 9000 && + ioctl(fd, GET_ARRAY_INFO, &array)>= 0) { + if (ioctl(fd, GET_DISK_INFO, &disc) >= 0 && + makedev((unsigned)disc.major,(unsigned)disc.minor) == stb.st_rdev) + activity = "active"; + else + activity = "mismatch"; + } + close(fd); } - close(fd); + } else { + activity = "unknown"; + mddev = "array"; } - printf("%s: device %d in %d device %s %s md%d. Use mdadm --examine for more detail.\n", + printf("%s: device %d in %d device %s %s %s. Use mdadm --examine for more detail.\n", dev, info.disk.number, info.array.raid_disks, activity, map_num(pers, info.array.level), - info.array.md_minor); + mddev); } return 0; }