Fix alignment problem in version-1 superblocks.

NOTE: This is an incompatable change affecting raid5 reshape.
If you want to reshape a raid5 using version-1 superblocks,
use 2.6.17-rc2 or later, and mdadm-2.4.1 or later.

Signed-off-by: Neil Brown <neilb@suse.de>

diff --git a/ChangeLog b/ChangeLog
index 44f188b67d1c640f7822e95b8253c752867dd288..ebf7f6e02fc808bf8869b1a3711a3c5ee4bc52c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Changes Prior to 2.4.1 release
+    -   Honour --write-mostly when adding to an array without persistent
+        superblocks.
+    -   Fix alignment problem in version-1 superblocks.
+       NOTE: This is an incompatable change affecting raid5 reshape.
+       If you want to reshape a raid5 using version-1 superblocks,
+       use 2.6.17-rc2 or later, and mdadm-2.4.1 or later.
+
 Changes Prior to 2.4 release
     -   Rewrite 'reshape' support including performing a backup
        of the critical region for a raid5 growth, and restoring that

diff --git a/super1.c b/super1.c
index 45c3d9562ab57b0c9ca0706a6b1770fc5d892462..27cec874293eb77356285b33c93639d648b19c9a 100644 (file)
--- a/super1.c
+++ b/super1.c
@@ -58,8 +58,8 @@ struct mdp_superblock_1 {
                                 */
 
        /* These are only valid with feature bit '4' */
-       __u64   reshape_position;       /* next address in array-space for reshape */
        __u32   new_level;      /* new level we are reshaping to                */
+       __u64   reshape_position;       /* next address in array-space for reshape */
        __u32   delta_disks;    /* change in number of raid_disks               */
        __u32   new_layout;     /* new layout                                   */
        __u32   new_chunk;      /* new chunk size (bytes)                       */