mdadm: improve the dlm locking mechanism for clustered raid

[thirdparty/mdadm.git] / Query.c

diff --git a/Query.c b/Query.c
index 0d18da4eb5e776e3520617306ad7c8797aace2c2..2bd0e2a005843fb9bd603276e12ca5d865d9402b 100644 (file)
--- a/Query.c
+++ b/Query.c
@@ -35,8 +35,9 @@ int Query(char *dev)
        int fd;
        int ioctlerr, staterr;
        int superror;
+       int level, raid_disks, spare_disks;
        struct mdinfo info;
-       mdu_array_info_t array;
+       struct mdinfo *sra;
        struct supertype *st = NULL;
        unsigned long long larray_size;
        struct stat stb;
@@ -50,16 +51,33 @@ 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 {
+               mdu_array_info_t array;
+
+               if (md_get_array_info(fd, &array) < 0) {
+                       ioctlerr = errno;
+                       level = -1;
+                       raid_disks = -1;
+                       spare_disks = -1;
+               } 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 +93,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)
@@ -99,7 +115,7 @@ int Query(char *dev)
                        disc.number = info.disk.number;
                        activity = "undetected";
                        if (mddev && (fd = open(mddev, O_RDONLY))>=0) {
-                               if (md_get_array_info(fd, &array) >= 0) {
+                               if (md_array_active(fd)) {
                                        if (md_get_disk_info(fd, &disc) >= 0 &&
                                            makedev((unsigned)disc.major,(unsigned)disc.minor) == stb.st_rdev)
                                                activity = "active";