Query: Remove all references to md_get_version()
More legacy code removed Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>
This commit is contained in:
parent
091e8e6e06
commit
5cb859962f
13
Query.c
13
Query.c
|
@ -33,7 +33,6 @@ int Query(char *dev)
|
||||||
* a superblock
|
* a superblock
|
||||||
*/
|
*/
|
||||||
int fd = open(dev, O_RDONLY);
|
int fd = open(dev, O_RDONLY);
|
||||||
int vers;
|
|
||||||
int ioctlerr;
|
int ioctlerr;
|
||||||
int superror;
|
int superror;
|
||||||
struct mdinfo info;
|
struct mdinfo info;
|
||||||
|
@ -52,7 +51,6 @@ int Query(char *dev)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
vers = md_get_version(fd);
|
|
||||||
if (md_get_array_info(fd, &array) < 0)
|
if (md_get_array_info(fd, &array) < 0)
|
||||||
ioctlerr = errno;
|
ioctlerr = errno;
|
||||||
else
|
else
|
||||||
|
@ -60,16 +58,12 @@ int Query(char *dev)
|
||||||
|
|
||||||
fstat(fd, &stb);
|
fstat(fd, &stb);
|
||||||
|
|
||||||
if (vers>=9000 && !ioctlerr) {
|
if (!ioctlerr) {
|
||||||
if (!get_dev_size(fd, NULL, &larray_size))
|
if (!get_dev_size(fd, NULL, &larray_size))
|
||||||
larray_size = 0;
|
larray_size = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vers < 0)
|
if (ioctlerr == ENODEV)
|
||||||
printf("%s: is not an md array\n", dev);
|
|
||||||
else if (vers < 9000)
|
|
||||||
printf("%s: is an md device, but kernel cannot provide details\n", dev);
|
|
||||||
else if (ioctlerr == ENODEV)
|
|
||||||
printf("%s: is an md device which is not active\n", dev);
|
printf("%s: is an md device which is not active\n", dev);
|
||||||
else if (ioctlerr)
|
else if (ioctlerr)
|
||||||
printf("%s: is an md device, but gives \"%s\" when queried\n",
|
printf("%s: is an md device, but gives \"%s\" when queried\n",
|
||||||
|
@ -100,8 +94,7 @@ int Query(char *dev)
|
||||||
disc.number = info.disk.number;
|
disc.number = info.disk.number;
|
||||||
activity = "undetected";
|
activity = "undetected";
|
||||||
if (mddev && (fd = open(mddev, O_RDONLY))>=0) {
|
if (mddev && (fd = open(mddev, O_RDONLY))>=0) {
|
||||||
if (md_get_version(fd) >= 9000 &&
|
if (md_get_array_info(fd, &array) >= 0) {
|
||||||
md_get_array_info(fd, &array) >= 0) {
|
|
||||||
if (md_get_disk_info(fd, &disc) >= 0 &&
|
if (md_get_disk_info(fd, &disc) >= 0 &&
|
||||||
makedev((unsigned)disc.major,(unsigned)disc.minor) == stb.st_rdev)
|
makedev((unsigned)disc.major,(unsigned)disc.minor) == stb.st_rdev)
|
||||||
activity = "active";
|
activity = "active";
|
||||||
|
|
Loading…
Reference in New Issue