Remove stray debugging printfs

[thirdparty/mdadm.git] / Detail.c

diff --git a/Detail.c b/Detail.c
index 1598a4252cd5d50698b327acb89feb3bc2333788..ba07c83da44ac90913850013194c7a0b89c18094 100644 (file)
--- a/Detail.c
+++ b/Detail.c
@@ -174,7 +174,7 @@ 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=%d.%02d\n",
+                               printf("MD_METADATA=%d.%d\n",
                                       array.major_version, array.minor_version);
                }
                
@@ -212,11 +212,11 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
                printf("ARRAY %s", dev);
                if (brief > 1) {
                        if (array.raid_disks)
-                               printf("level=%s num-devices=%d",
+                               printf(" level=%s num-devices=%d",
                                       c?c:"-unknown-",
                                       array.raid_disks );
                        else
-                               printf("level=container num-devices=%d",
+                               printf(" level=container num-devices=%d",
                                       array.nr_disks);
                }
                if (container) {
@@ -226,7 +226,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=%d.%02d",
+                               printf(" metadata=%d.%d",
                                       array.major_version, array.minor_version);
                }
 
@@ -259,7 +259,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 : %d.%02d\n",
+                       printf("        Version : %d.%d\n",
                               array.major_version, array.minor_version);
                }
 
@@ -325,6 +325,10 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
                        c = map_num(r5layout, array.layout);
                        printf("         Layout : %s\n", c?c:"-unknown-");
                }
+               if (array.level == 6) {
+                       c = map_num(r6layout, array.layout);
+                       printf("         Layout : %s\n", c?c:"-unknown-");
+               }
                if (array.level == 10) {
                        printf("         Layout :");
                        print_r10_layout(array.layout);
@@ -378,6 +382,11 @@ This is pretty boring
                                        printf("     New Layout : %s\n",
                                               c?c:"-unknown-");
                                }
+                               if (info.new_level == 6) {
+                                       char *c = map_num(r6layout, info.new_layout);
+                                       printf("     New Layout : %s\n",
+                                              c?c:"-unknown-");
+                               }
                                if (info.new_level == 10) {
                                        printf("     New Layout : near=%d, %s=%d\n",
                                               info.new_layout&255,
@@ -541,6 +550,7 @@ This is pretty boring
                    1, avail, avail_disks))
                rv = 2;
 
+       free(disks);
 out:
        close(fd);
        return rv;