Fix parsing of /dev/md/N in is_standard

[thirdparty/mdadm.git] / Detail.c

diff --git a/Detail.c b/Detail.c
index 59b091fe149119821288572c32fd6906a5904c7a..370177a4e9586d4f902196da49bdf848e6118ded 100644 (file)
--- a/Detail.c
+++ b/Detail.c
@@ -50,6 +50,8 @@ int Detail(char *dev, int brief, int test)
        int is_26 = get_linux_version() >= 2006000;
        int is_rebuilding = 0;
        int failed = 0;
+       struct supertype *st = NULL;
+       int max_disks = MD_SB_DISKS;
 
        void *super = NULL;
        int rv = test ? 4 : 1;
@@ -82,12 +84,16 @@ int Detail(char *dev, int brief, int test)
                close(fd);
                return rv;
        }
+       st = super_by_version(array.major_version, array.minor_version);
+
        if (fstat(fd, &stb) != 0 && !S_ISBLK(stb.st_mode))
                stb.st_rdev = 0;
        rv = 0;
 
+       if (st) max_disks = st->max_devs;
+
        /* try to load a superblock */
-       for (d= 0; d<MD_SB_DISKS; d++) {
+       for (d= 0; d<max_disks; d++) {
                mdu_disk_info_t disk;
                char *dv;
                disk.number = d;
@@ -103,10 +109,10 @@ int Detail(char *dev, int brief, int test)
                                 * to get more info
                                 */
                                int fd2 = open(dv, O_RDONLY);
-                               if (fd2 >=0 &&
-                                   load_super0(fd2, &super, NULL) == 0) {
+                               if (fd2 >=0 && st &&
+                                   st->ss->load_super(st, fd2, &super, NULL) == 0) {
                                        struct mdinfo info;
-                                       getinfo_super0(&info, super);
+                                       st->ss->getinfo_super(&info, super);
                                        if (info.array.ctime != array.ctime ||
                                            info.array.level != array.level) {
                                                free(super);
@@ -202,12 +208,12 @@ int Detail(char *dev, int brief, int test)
                }
                free_mdstat(ms);
 
-               if (super)
-                       detail_super0(super);
+               if (super && st)
+                       st->ss->detail_super(super);
 
                printf("    Number   Major   Minor   RaidDevice State\n");
        }
-       for (d= 0; d<MD_SB_DISKS; d++) {
+       for (d= 0; d < max_disks; d++) {
                mdu_disk_info_t disk;
                char *dv;
                disk.number = d;
@@ -275,8 +281,8 @@ int Detail(char *dev, int brief, int test)
                if (!brief) printf("\n");
        }
        if (spares && brief) printf(" spares=%d", spares);
-       if (super && brief)
-               brief_detail_super0(super);
+       if (super && brief && st)
+               st->ss->brief_detail_super(super);
 
        if (brief && devices) printf("\n   devices=%s", devices);
        if (brief) printf("\n");