Fix some endian-ness issues with v1 superblocks.

diff --git a/ChangeLog b/ChangeLog
index 154c2b420497459a485f72e1798ee558de6580f1..ac11d1ad34c500bec439e788f9bcc009cfcb4563 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
-Changes Priot to this release
+Changes Prior to this release

     -   When creating devices in /dev/md/ create matching symlinks
        from /dev.  e.g. /dev/md0 -> /dev/md/0.
        Allow this to be disabled in mdadm.conf or on command line.
     -   When creating devices in /dev/md/ create matching symlinks
        from /dev.  e.g. /dev/md0 -> /dev/md/0.
        Allow this to be disabled in mdadm.conf or on command line.

+    -   Fix some endian-ness issues with version-1 superblocks (affects
+       bigendian only).

 
 Changes Prior to 2.5.3 release
     -   Document v0.91 superblocks in md.4
 
 Changes Prior to 2.5.3 release
     -   Document v0.91 superblocks in md.4

diff --git a/super1.c b/super1.c
index 8e6703be0ca9a82628859205b0125865a3409abf..0d88dbd009bca368196cc7efe0b23eeeac19e91e 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;
 
        csum = (newcsum & 0xffffffff) + (newcsum >> 32);
        sb->sb_csum = disk_csum;

-       return csum;
+       return __cpu_to_le32(csum);

 }
 
 #ifndef MDASSEMBLE
 }
 
 #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 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);
 
        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:
                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)
                }
                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)__le44_to_cpu(sb->size),
+                              human_size(ddsks*__le64_to_cpu(sb->size)<<9));

                if (sb->size != sb->data_size)
                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));
        }
        if (sb->data_offset)
                printf("    Data Offset : %llu sectors\n", (unsigned long long)__le64_to_cpu(sb->data_offset));


@@ -335,7 +343,7 @@ static void brief_examine_super1(void *sbv)
 
        printf("ARRAY /dev/md/%s level=%s metadata=1 num-devices=%d UUID=",
               nm,
 
        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(":");
        for (i=0; i<16; i++) {
                printf("%02x", sb->set_uuid[i]);
                if ((i&3)==0 && i != 0) printf(":");


@@ -760,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->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) {
 
        if ((rfd = open("/dev/urandom", O_RDONLY)) < 0 ||
            read(rfd, sb->device_uuid, 16) != 16) {