wait_for improvement.

[thirdparty/mdadm.git] / Detail.c

diff --git a/Detail.c b/Detail.c
index dc11102856b4522017f2d48fdf6bfdaa6611de05..dea605eae82978cbc31d49e3ceb3f41b325d72b6 100644 (file)
--- a/Detail.c
+++ b/Detail.c
@@ -166,19 +166,30 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
                        if (sra && sra->array.major_version < 0)
                                printf("MD_METADATA=%s\n", sra->text_version);
                        else
-                               printf("MD_METADATA=%02d.%02d\n",
+                               printf("MD_METADATA=%d.%02d\n",
                                       array.major_version, array.minor_version);
                }
                
                if (st && st->sb) {
                        struct mdinfo info;
                        char nbuf[64];
+                       struct map_ent *mp, *map = NULL;
                        st->ss->getinfo_super(st, &info);
                        fname_from_uuid(st, &info, nbuf, ':');
                        printf("MD_UUID=%s\n", nbuf+5);
+                       mp = map_by_uuid(&map, info.uuid);
+                       if (mp && mp->path &&
+                           strncmp(mp->path, "/dev/md/", 8) == 0)
+                               printf("MD_DEVNAME=%s\n", mp->path+8);
 
                        if (st->ss->export_detail_super)
                                st->ss->export_detail_super(st);
+               } else {
+                       struct map_ent *mp, *map = NULL;
+                       mp = map_by_devnum(&map, fd2devnum(fd));
+                       if (mp && mp->path &&
+                           strncmp(mp->path, "/dev/md/", 8) == 0)
+                               printf("MD_DEVNAME=%s\n", mp->path+8);
                }
                goto out;
        }
@@ -200,7 +211,7 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
                        if (sra && sra->array.major_version < 0)
                                printf(" metadata=%s", sra->text_version);
                        else
-                               printf(" metadata=%02d.%02d",
+                               printf(" metadata=%d.%02d",
                                       array.major_version, array.minor_version);
                }
 
@@ -216,7 +227,7 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
                struct mdstat_ent *ms = mdstat_read(0, 0);
                struct mdstat_ent *e;
                int devnum = array.md_minor;
-               if (major(stb.st_rdev) != MD_MAJOR)
+               if (major(stb.st_rdev) == get_mdp_major())
                        devnum = -1 - devnum;
 
                for (e=ms; e; e=e->next)
@@ -233,7 +244,7 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
                if (sra && sra->array.major_version < 0)
                        printf("        Version : %s\n", sra->text_version);
                else
-                       printf("        Version : %02d.%02d\n",
+                       printf("        Version : %d.%02d\n",
                               array.major_version, array.minor_version);
                }
 
@@ -250,8 +261,8 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
                                unsigned long long dsize = get_component_size(fd);
                                if (dsize > 0)
                                        printf("  Used Dev Size : %llu%s\n",
-                                              dsize,
-                                        human_size((long long)dsize<<10));
+                                              dsize/2,
+                                        human_size((long long)dsize<<9));
                                else
                                        printf("  Used Dev Size : unknown\n");
                        } else
@@ -519,3 +530,44 @@ out:
        close(fd);
        return rv;
 }
+
+int Detail_Platform(struct superswitch *ss, int scan, int verbose)
+{
+       /* display platform capabilities for the given metadata format
+        * 'scan' in this context means iterate over all metadata types
+        */
+       int i;
+       int err = 1;
+
+       if (ss && ss->detail_platform)
+               err = ss->detail_platform(verbose, 0);
+       else if (ss) {
+               if (verbose)
+                       fprintf(stderr, Name ": %s metadata is platform independent\n",
+                               ss->name ? : "[no name]");
+       } else if (!scan) {
+               if (verbose)
+                       fprintf(stderr, Name ": specify a metadata type or --scan\n");
+       }
+
+       if (!scan)
+               return err;
+
+       for (i = 0; superlist[i]; i++) {
+               struct superswitch *meta = superlist[i];
+
+               if (meta == ss)
+                       continue;
+               if (verbose)
+                       fprintf(stderr, Name ": checking metadata %s\n",
+                               meta->name ? : "[no name]");
+               if (!meta->detail_platform) {
+                       if (verbose)
+                               fprintf(stderr, Name ": %s metadata is platform independent\n",
+                                       meta->name ? : "[no name]");
+               } else
+                       err |= meta->detail_platform(verbose, 0);
+       }
+
+       return err;
+}