More consistent honoring of --configfile

[thirdparty/mdadm.git] / super1.c

diff --git a/super1.c b/super1.c
index 9dc66448d8c0fe1148f9b1e09612e345307c6238..8e6703be0ca9a82628859205b0125865a3409abf 100644 (file)
--- a/super1.c
+++ b/super1.c
@@ -124,8 +124,10 @@ static unsigned int calc_sb_1_csum(struct mdp_superblock_1 * sb)
        disk_csum = sb->sb_csum;
        sb->sb_csum = 0;
        newcsum = 0;
-       for (i=0; size>=4; size -= 4 )
-               newcsum += __le32_to_cpu(*isuper++);
+       for (i=0; size>=4; size -= 4 ) {
+               newcsum += __le32_to_cpu(*isuper);
+               isuper++;
+       }
 
        if (size == 2)
                newcsum += __le16_to_cpu(*(unsigned short*) isuper);
@@ -275,6 +277,18 @@ static void examine_super1(void *sbv, char *homehost)
        default: break;
        }
        printf("\n");
+       printf("    Array Slot : %d (", __le32_to_cpu(sb->dev_number));
+       for (i= __le32_to_cpu(sb->max_dev); i> 0 ; i--)
+               if (__le16_to_cpu(sb->dev_roles[i-1]) != 0xffff)
+                       break;
+       for (d=0; d < i; d++) {
+               int role = __le16_to_cpu(sb->dev_roles[d]);
+               if (d) printf(", ");
+               if (role == 0xffff) printf("empty");
+               else if(role == 0xfffe) printf("failed");
+               else printf("%d", role);
+       }
+       printf(")\n");
        printf("   Array State : ");
        for (d=0; d<__le32_to_cpu(sb->raid_disks); d++) {
                int cnt = 0;
@@ -309,6 +323,7 @@ static void brief_examine_super1(void *sbv)
        struct mdp_superblock_1 *sb = sbv;
        int i;
        char *nm;
+       char *c=map_num(pers, __le32_to_cpu(sb->level));
 
        nm = strchr(sb->set_name, ':');
        if (nm)
@@ -318,8 +333,6 @@ static void brief_examine_super1(void *sbv)
        else
                nm = "??";
 
-       char *c=map_num(pers, __le32_to_cpu(sb->level));
-
        printf("ARRAY /dev/md/%s level=%s metadata=1 num-devices=%d UUID=",
               nm,
               c?c:"-unknown-", sb->raid_disks);
@@ -766,7 +779,11 @@ static int write_init_super1(struct supertype *st, void *sbv,
                if (memcmp(sb->set_uuid, refsb->set_uuid, 16)==0) {
                        /* same array, so preserve events and dev_number */
                        sb->events = refsb->events;
-                       sb->dev_number = refsb->dev_number;
+                       /* bugs in 2.6.17 and earlier mean the dev_number
+                        * chosen in Manage must be preserved
+                        */
+                       if (get_linux_version() >= 2006018)
+                               sb->dev_number = refsb->dev_number;
                }
                free(refsb);
        }