Some little bits and pieces...

I'm obviously bored of writing changelog entries.

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

diff --git a/super1.c b/super1.c
index afe29984ce766a21f1d50451cb6b2670280b00a6..b4af6cc82deca7ca9bf602b9710cac11e82962cb 100644 (file)
--- a/super1.c
+++ b/super1.c
@@ -694,14 +694,14 @@ static int write_init_super1(struct supertype *st, void *sbv,
                sb_offset &= ~(4*2-1);
                sb->super_offset = __cpu_to_le64(sb_offset);
                sb->data_offset = __cpu_to_le64(0);
-               if (sb_offset-64*2 >= array_size)
+               if (sb_offset-64*2 >= array_size && array_size > 8*1024*1024*2)
                        sb->data_size = __cpu_to_le64(sb_offset-64*2);
                else
                        sb->data_size = __cpu_to_le64(sb_offset);
                break;
        case 1:
                sb->super_offset = __cpu_to_le64(0);
-               if (dsize - 64*2 >= array_size)
+               if (dsize - 64*2 >= array_size && array_size > 8*1024*1024*2)
                        space = 64*2;
                else
                        space = 4*2;
@@ -710,7 +710,7 @@ static int write_init_super1(struct supertype *st, void *sbv,
                break;
        case 2:
                sb_offset = 4*2;
-               if (dsize - 4*2 - 64*2 >= array_size)
+               if (dsize - 4*2 - 64*2 >= array_size && array_size > 8*1024*1024*2)
                        space = 64*2;
                else
                        space = 4*2;

diff --git a/tests/00raid4 b/tests/00raid4
index 46383873624becc349e6a5a764e52770feedf18f..3618aa9cee550c95e48c60c96fd949bdc60757b3 100644 (file)
--- a/tests/00raid4
+++ b/tests/00raid4
@@ -2,13 +2,13 @@
 # create a simple raid4 set
 
 mdadm -CfR $md0 -l 4 -n3 $dev0 $dev1 $dev2 
-check resync ; check raid5
+check resync ; check raid[45]
 testdev $md0 2 $mdsize0 64
 mdadm -S $md0
 
 # now with version-1 superblock
 mdadm -CR $md0 -e1 --level=raid4 -n4 $dev0 $dev1 $dev2 $dev3 
-check resync; check raid5
+check resync; check raid[45]
 testdev $md0 3 $mdsize1 64
 mdadm -S $md0
 

diff --git a/tests/03r0assem b/tests/03r0assem
index 6428cc066a998857f94290511ed463cdac57b878..4f03d7bdc2ee0d2516c4684567d8bff5d80e88f6 100644 (file)
--- a/tests/03r0assem
+++ b/tests/03r0assem
@@ -67,7 +67,7 @@ mdadm -S $md2
 
 ### Now for version 1...
 
-
+mdadm --zero-superblock $dev0 $dev1 $dev2
 mdadm -CR $md2 -l0 --metadata=1.0 -n3 $dev0 $dev1 $dev2 
 check raid0
 tst="testdev $md2 3 $mdsize1 64"