Monitor: reduce default poll interval if mdstat is pollable.

[thirdparty/mdadm.git] / Detail.c

diff --git a/Detail.c b/Detail.c
index 0d6bcf5ee7909ce1d1fb31e165076b7553c3c19c..54db558b48dd8664f9f660d3a3a25642ecc32e8e 100644 (file)
--- a/Detail.c
+++ b/Detail.c
@@ -196,14 +196,16 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
 
        if (brief) {
                mdu_bitmap_file_t bmf;
-               if (array.raid_disks)
-                       printf("ARRAY %s level=%s num-devices=%d", dev,
-                              c?c:"-unknown-",
-                              array.raid_disks );
-               else
-                       printf("ARRAY %s level=container num-devices=%d",
-                              dev, array.nr_disks);
-
+               printf("ARRAY %s", dev);
+               if (brief > 1) {
+                       if (array.raid_disks)
+                               printf("level=%s num-devices=%d",
+                                      c?c:"-unknown-",
+                                      array.raid_disks );
+                       else
+                               printf("level=container num-devices=%d",
+                                      array.nr_disks);
+               }
                if (container) {
                        printf(" container=%s", container);
                        printf(" member=%s", member);
@@ -261,8 +263,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
@@ -540,7 +542,7 @@ int Detail_Platform(struct superswitch *ss, int scan, int verbose)
        int err = 1;
 
        if (ss && ss->detail_platform)
-               err = ss->detail_platform(verbose);
+               err = ss->detail_platform(verbose, 0);
        else if (ss) {
                if (verbose)
                        fprintf(stderr, Name ": %s metadata is platform independent\n",
@@ -566,7 +568,7 @@ int Detail_Platform(struct superswitch *ss, int scan, int verbose)
                                fprintf(stderr, Name ": %s metadata is platform independent\n",
                                        meta->name ? : "[no name]");
                } else
-                       err |= meta->detail_platform(verbose);
+                       err |= meta->detail_platform(verbose, 0);
        }
 
        return err;