diff options
| author | Neil Brown <neilb@suse.de> | 2006-02-02 03:19:57 +0000 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2006-02-02 03:19:57 +0000 |
| commit | 561832f9d4a162b40190c70e872be46ec7218aea (patch) | |
| tree | 33f9f3164e511c1886356ae9fac5ac8d7424ede0 | |
| parent | 881990a2e440d58d2c1d070e9005225f56d21260 (diff) | |
| download | mdadm-561832f9d4a162b40190c70e872be46ec7218aea.tar.gz mdadm-561832f9d4a162b40190c70e872be46ec7218aea.tar.xz mdadm-561832f9d4a162b40190c70e872be46ec7218aea.zip | |
Some little bits and pieces...
I'm obviously bored of writing changelog entries.
Signed-off-by: Neil Brown <neilb@suse.de>
| -rw-r--r-- | super1.c | 6 | ||||
| -rw-r--r-- | tests/00raid4 | 4 | ||||
| -rw-r--r-- | tests/03r0assem | 2 |
3 files changed, 6 insertions, 6 deletions
@@ -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 4638387..3618aa9 100644 --- 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 6428cc0..4f03d7b 100644 --- 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" |