mdadm-1.6.0

[thirdparty/mdadm.git] / Examine.c

diff --git a/Examine.c b/Examine.c
index b886afc27f75612646b836c42cd3bd155f0cb63c..1f2374586fae5373854fff437a03867b1ddfdf7b 100644 (file)
--- a/Examine.c
+++ b/Examine.c
@@ -60,6 +60,7 @@ int Examine(mddev_dev_t devlist, int brief, int scan, int SparcAdjust)
        char *c;
        int rv = 0;
        int err;
+       int spares = 0;
 
        struct array {
                mdp_super_t super;
@@ -151,9 +152,8 @@ int Examine(mddev_dev_t devlist, int brief, int scan, int SparcAdjust)
                        printf("\n");
                        atime = super.utime;
                        printf("    Update Time : %.24s\n", ctime(&atime));
-                       printf("          State : %s, %serrors\n",
-                              (super.state&(1<<MD_SB_CLEAN))?"clean":"dirty",
-                              (super.state&(1<<MD_SB_ERRORS))?"":"no-");
+                       printf("          State : %s\n",
+                              (super.state&(1<<MD_SB_CLEAN))?"clean":"dirty");
                        printf(" Active Devices : %d\n", super.active_disks);
                        printf("Working Devices : %d\n", super.working_disks);
                        printf(" Failed Devices : %d\n", super.failed_disks);
@@ -161,7 +161,7 @@ int Examine(mddev_dev_t devlist, int brief, int scan, int SparcAdjust)
                        if (calc_sb_csum(&super) == super.sb_csum)
                                printf("       Checksum : %x - correct\n", super.sb_csum);
                        else
-                               printf("       Checksum : %x - expected %x\n", super.sb_csum, calc_sb_csum(&super));
+                               printf("       Checksum : %x - expected %lx\n", super.sb_csum, calc_sb_csum(&super));
                        if (SparcAdjust) {
                                /* 2.2 sparc put the events in the wrong place
                                 * So we copy the tail of the superblock
@@ -170,7 +170,7 @@ int Examine(mddev_dev_t devlist, int brief, int scan, int SparcAdjust)
                                __u32 *sb32 = (__u32*)&super;
                                memcpy(sb32+MD_SB_GENERIC_CONSTANT_WORDS+7,
                                       sb32+MD_SB_GENERIC_CONSTANT_WORDS+7+1,
-                                      MD_SB_WORDS - (MD_SB_GENERIC_CONSTANT_WORDS+7+1));
+                                      (MD_SB_WORDS - (MD_SB_GENERIC_CONSTANT_WORDS+7+1))*4);
                                printf (" --- adjusting superblock for 2.2/sparc compatability ---\n");
                        }
                        printf("         Events : %d.%d\n", super.events_hi, super.events_lo);
@@ -205,6 +205,7 @@ int Examine(mddev_dev_t devlist, int brief, int scan, int SparcAdjust)
                                if (dp->state & (1<<MD_DISK_ACTIVE)) printf(" active");
                                if (dp->state & (1<<MD_DISK_SYNC)) printf(" sync");
                                if (dp->state & (1<<MD_DISK_REMOVED)) printf(" removed");
+                               if (dp->state == 0) { printf(" spare"); spares++; }
                                if ((dv=map_dev(dp->major, dp->minor)))
                                        printf("   %s", dv);
                                printf("\n");
@@ -234,8 +235,10 @@ int Examine(mddev_dev_t devlist, int brief, int scan, int SparcAdjust)
                        char sep='=';
                        char *c=map_num(pers, ap->super.level);
                        char *d;
-                       printf("ARRAY /dev/md%d level=%s num-devices=%d UUID=",
-                              ap->super.md_minor, c?c:"-unknown-", ap->super.raid_disks);
+                       printf("ARRAY %s level=%s num-devices=%d UUID=",
+                              get_md_name(ap->super.md_minor),
+                              c?c:"-unknown-", ap->super.raid_disks);
+                       if (spares) printf(" spares=%d", spares);
                        if (ap->super.minor_version >= 90)
                                printf("%08x:%08x:%08x:%08x", ap->super.set_uuid0, ap->super.set_uuid1,
                                       ap->super.set_uuid2, ap->super.set_uuid3);