imsm: remove redundant characters from some error messages

[thirdparty/mdadm.git] / Detail.c

diff --git a/Detail.c b/Detail.c
index 5bd2dc641ff7d9618f3b500930e7c679c080eb94..925e4794c983785698d1648a80d5e6b49fb2d956 100644 (file)
--- a/Detail.c
+++ b/Detail.c
@@ -130,7 +130,7 @@ int Detail(char *dev, struct context *c)
                /* This is a subarray of some container.
                 * We want the name of the container, and the member
                 */
-               int devid = devnm2devid(st->container_devnm);
+               dev_t devid = devnm2devid(st->container_devnm);
                int cfd, err;
 
                member = subarray;
@@ -323,10 +323,12 @@ int Detail(char *dev, struct context *c)
                if (disk.major == 0 && disk.minor == 0)
                        continue;
                if (disk.raid_disk >= 0 && disk.raid_disk < array.raid_disks
-                   && disks[disk.raid_disk*2].state == (1<<MD_DISK_REMOVED))
+                   && disks[disk.raid_disk*2].state == (1<<MD_DISK_REMOVED)
+                   && ((disk.state & (1<<MD_DISK_JOURNAL)) == 0))
                        disks[disk.raid_disk*2] = disk;
                else if (disk.raid_disk >= 0 && disk.raid_disk < array.raid_disks
-                        && disks[disk.raid_disk*2+1].state == (1<<MD_DISK_REMOVED))
+                        && disks[disk.raid_disk*2+1].state == (1<<MD_DISK_REMOVED)
+                        && !(disk.state & (1<<MD_DISK_JOURNAL)))
                        disks[disk.raid_disk*2+1] = disk;
                else if (next < max_disks*2)
                        disks[next++] = disk;
@@ -424,8 +426,9 @@ int Detail(char *dev, struct context *c)
                                else
                                        printf("  Used Dev Size : unknown\n");
                        } else
-                               printf("  Used Dev Size : %d%s\n", array.size,
-                                      human_size((long long)array.size<<10));
+                               printf("  Used Dev Size : %lu%s\n",
+                                      (unsigned long)array.size,
+                                      human_size((unsigned long long)array.size<<10));
                }
                if (array.raid_disks)
                        printf("   Raid Devices : %d\n", array.raid_disks);
@@ -575,12 +578,12 @@ This is pretty boring
                                char path[200];
                                char vbuf[1024];
                                int nlen = strlen(sra->sys_name);
-                               int devid;
+                               dev_t devid;
                                if (de->d_name[0] == '.')
                                        continue;
                                sprintf(path, "/sys/block/%s/md/metadata_version",
                                        de->d_name);
-                               if (load_sys(path, vbuf) < 0)
+                               if (load_sys(path, vbuf, sizeof(vbuf)) < 0)
                                        continue;
                                if (strncmp(vbuf, "external:", 9) != 0 ||
                                    !is_subarray(vbuf+9) ||
@@ -618,10 +621,10 @@ This is pretty boring
                        continue;
                if (!c->brief) {
                        if (d == array.raid_disks*2) printf("\n");
-                       if (disk.number < 0)
+                       if (disk.number < 0 && disk.raid_disk < 0)
                                printf("       -   %5d    %5d        -     ",
                                       disk.major, disk.minor);
-                       else if (disk.raid_disk < 0)
+                       else if (disk.raid_disk < 0 || disk.state & (1<<MD_DISK_JOURNAL))
                                printf("   %5d   %5d    %5d        -     ",
                                       disk.number, disk.major, disk.minor);
                        else if (disk.number < 0)