diff options
author | NeilBrown <neilb@suse.de> | 2008-08-07 14:12:25 +1000 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2008-08-07 14:12:25 +1000 |
commit | 37ea3936a696c2b102963ba5117165ef6be8d4b4 (patch) | |
tree | 75fe06d0b49ef74f834a25920f003c693023857e /tests/07testreshape5 | |
parent | 9ca2c81c0f8bd37ef24e5e3ac898ffb6cfd00117 (diff) | |
parent | e5669f40047ba0a8354418d0af5f7e7d862aaea4 (diff) | |
download | mdadm-37ea3936a696c2b102963ba5117165ef6be8d4b4.tar.gz mdadm-37ea3936a696c2b102963ba5117165ef6be8d4b4.tar.xz mdadm-37ea3936a696c2b102963ba5117165ef6be8d4b4.zip |
Merge branch 'master' into from-stable
Conflicts:
Create.c
Manage.c
Diffstat (limited to 'tests/07testreshape5')
-rw-r--r-- | tests/07testreshape5 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/07testreshape5 b/tests/07testreshape5 index 8f56a72..44d5ddc 100644 --- a/tests/07testreshape5 +++ b/tests/07testreshape5 @@ -20,7 +20,7 @@ do # test restore: make a raid5 from a file, then do a compare dd if=/dev/urandom of=/tmp/RandFile bs=1024 count=$size $dir/test_stripe restore /tmp/RandFile $disks $[chunk*1024] 5 $nlayout 0 $[size*1024] $devs - $mdadm -CR $md0 -amd -l5 -n$disks --assume-clean -c $chunk -p $layout $devs + mdadm -CR $md0 -amd -l5 -n$disks --assume-clean -c $chunk -p $layout $devs cmp -s -n $[size*1024] $md0 /tmp/RandFile || { echo cmp failed ; exit 2; } # FIXME check parity @@ -30,7 +30,7 @@ do > /tmp/NewRand $dir/test_stripe save /tmp/NewRand $disks $[chunk*1024] 5 $nlayout 0 $[size*1024] $devs cmp -s -n $[size*1024] $md0 /tmp/NewRand || { echo cmp failed ; exit 2; } - $mdadm -S $md0 + mdadm -S $md0 done done done |