Clarify when update=super-minor happens automatcially

[thirdparty/mdadm.git] / super1.c

diff --git a/super1.c b/super1.c
index bcfe573567bceff5568243baea7ca93e2103b5c7..cbf4d38d644b7875a2a0c559e80a6689bdb2ad1a 100644 (file)
--- a/super1.c
+++ b/super1.c
@@ -134,7 +134,7 @@ static unsigned int calc_sb_1_csum(struct mdp_superblock_1 * sb)
 
        csum = (newcsum & 0xffffffff) + (newcsum >> 32);
        sb->sb_csum = disk_csum;
-       return csum;
+       return __cpu_to_le32(csum);
 }
 
 #ifndef MDASSEMBLE
@@ -147,6 +147,7 @@ static void examine_super1(void *sbv, char *homehost)
        int i;
        char *c;
        int l = homehost ? strlen(homehost) : 0;
+       int layout;
 
        printf("          Magic : %08x\n", __le32_to_cpu(sb->magic));
        printf("        Version : %02d\n", 1);
@@ -175,14 +176,21 @@ static void examine_super1(void *sbv, char *homehost)
                switch(__le32_to_cpu(sb->level)) {
                case 1: ddsks=1;break;
                case 4:
-               case 5: ddsks = sb->raid_disks-1; break;
-               case 6: ddsks = sb->raid_disks-2; break;
-               case 10: ddsks = sb->raid_disks / (sb->layout&255) / ((sb->layout>>8)&255);
+               case 5: ddsks = __le32_to_cpu(sb->raid_disks)-1; break;
+               case 6: ddsks = __le32_to_cpu(sb->raid_disks)-2; break;
+               case 10:
+                       layout = __le32_to_cpu(sb->layout);
+                       ddsks = __le32_to_cpu(sb->raid_disks)
+                                / (layout&255) / ((layout>>8)&255);
                }
                if (ddsks)
-                       printf("     Array Size : %llu%s\n", ddsks*(unsigned long long)sb->size, human_size(ddsks*sb->size<<9));
+                       printf("     Array Size : %llu%s\n",
+                              ddsks*(unsigned long long)__le64_to_cpu(sb->size),
+                              human_size(ddsks*__le64_to_cpu(sb->size)<<9));
                if (sb->size != sb->data_size)
-                       printf("      Used Size : %llu%s\n", (unsigned long long)sb->size, human_size(sb->size<<9));
+                       printf("      Used Size : %llu%s\n",
+                              (unsigned long long)__le64_to_cpu(sb->size),
+                              human_size(__le64_to_cpu(sb->size)<<9));
        }
        if (sb->data_offset)
                printf("    Data Offset : %llu sectors\n", (unsigned long long)__le64_to_cpu(sb->data_offset));
@@ -277,6 +285,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;
@@ -323,7 +343,7 @@ static void brief_examine_super1(void *sbv)
 
        printf("ARRAY /dev/md/%s level=%s metadata=1 num-devices=%d UUID=",
               nm,
-              c?c:"-unknown-", sb->raid_disks);
+              c?c:"-unknown-", __le32_to_cpu(sb->raid_disks));
        for (i=0; i<16; i++) {
                printf("%02x", sb->set_uuid[i]);
                if ((i&3)==0 && i != 0) printf(":");
@@ -748,7 +768,7 @@ static int write_init_super1(struct supertype *st, void *sbv,
 
        sb->dev_number = __cpu_to_le32(dinfo->number);
        if (dinfo->state & (1<<MD_DISK_WRITEMOSTLY))
-               sb->devflags |= WriteMostly1;
+               sb->devflags |= __cpu_to_le32(WriteMostly1);
 
        if ((rfd = open("/dev/urandom", O_RDONLY)) < 0 ||
            read(rfd, sb->device_uuid, 16) != 16) {
@@ -767,7 +787,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);
        }