md: raid6: clean up the style of raid6test/test.c
Clean up the coding style in raid6test/test.c. Break it apart into subfunctions to make the code more readable. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
98ec302be5
commit
66c811e993
|
@ -1,12 +1,10 @@
|
||||||
/* -*- linux-c -*- ------------------------------------------------------- *
|
/* -*- linux-c -*- ------------------------------------------------------- *
|
||||||
*
|
*
|
||||||
* Copyright 2002 H. Peter Anvin - All Rights Reserved
|
* Copyright 2002-2007 H. Peter Anvin - All Rights Reserved
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This file is part of the Linux kernel, and is made available under
|
||||||
* it under the terms of the GNU General Public License as published by
|
* the terms of the GNU General Public License version 2 or (at your
|
||||||
* the Free Software Foundation, Inc., 53 Temple Place Ste 330,
|
* option) any later version; incorporated herein by reference.
|
||||||
* Bostom MA 02111-1307, USA; either version 2 of the License, or
|
|
||||||
* (at your option) any later version; incorporated herein by reference.
|
|
||||||
*
|
*
|
||||||
* ----------------------------------------------------------------------- */
|
* ----------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
@ -30,67 +28,87 @@ char *dataptrs[NDISKS];
|
||||||
char data[NDISKS][PAGE_SIZE];
|
char data[NDISKS][PAGE_SIZE];
|
||||||
char recovi[PAGE_SIZE], recovj[PAGE_SIZE];
|
char recovi[PAGE_SIZE], recovj[PAGE_SIZE];
|
||||||
|
|
||||||
void makedata(void)
|
static void makedata(void)
|
||||||
{
|
{
|
||||||
int i, j;
|
int i, j;
|
||||||
|
|
||||||
for ( i = 0 ; i < NDISKS ; i++ ) {
|
for (i = 0; i < NDISKS; i++) {
|
||||||
for ( j = 0 ; j < PAGE_SIZE ; j++ ) {
|
for (j = 0; j < PAGE_SIZE; j++)
|
||||||
data[i][j] = rand();
|
data[i][j] = rand();
|
||||||
}
|
|
||||||
dataptrs[i] = data[i];
|
dataptrs[i] = data[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static char disk_type(int d)
|
||||||
|
{
|
||||||
|
switch (d) {
|
||||||
|
case NDISKS-2:
|
||||||
|
return 'P';
|
||||||
|
case NDISKS-1:
|
||||||
|
return 'Q';
|
||||||
|
default:
|
||||||
|
return 'D';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static int test_disks(int i, int j)
|
||||||
|
{
|
||||||
|
int erra, errb;
|
||||||
|
|
||||||
|
memset(recovi, 0xf0, PAGE_SIZE);
|
||||||
|
memset(recovj, 0xba, PAGE_SIZE);
|
||||||
|
|
||||||
|
dataptrs[i] = recovi;
|
||||||
|
dataptrs[j] = recovj;
|
||||||
|
|
||||||
|
raid6_dual_recov(NDISKS, PAGE_SIZE, i, j, (void **)&dataptrs);
|
||||||
|
|
||||||
|
erra = memcmp(data[i], recovi, PAGE_SIZE);
|
||||||
|
errb = memcmp(data[j], recovj, PAGE_SIZE);
|
||||||
|
|
||||||
|
if (i < NDISKS-2 && j == NDISKS-1) {
|
||||||
|
/* We don't implement the DQ failure scenario, since it's
|
||||||
|
equivalent to a RAID-5 failure (XOR, then recompute Q) */
|
||||||
|
erra = errb = 0;
|
||||||
|
} else {
|
||||||
|
printf("algo=%-8s faila=%3d(%c) failb=%3d(%c) %s\n",
|
||||||
|
raid6_call.name,
|
||||||
|
i, disk_type(i),
|
||||||
|
j, disk_type(j),
|
||||||
|
(!erra && !errb) ? "OK" :
|
||||||
|
!erra ? "ERRB" :
|
||||||
|
!errb ? "ERRA" : "ERRAB");
|
||||||
|
}
|
||||||
|
|
||||||
|
dataptrs[i] = data[i];
|
||||||
|
dataptrs[j] = data[j];
|
||||||
|
|
||||||
|
return erra || errb;
|
||||||
|
}
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
const struct raid6_calls * const * algo;
|
const struct raid6_calls *const *algo;
|
||||||
int i, j;
|
int i, j;
|
||||||
int erra, errb;
|
int err = 0;
|
||||||
|
|
||||||
makedata();
|
makedata();
|
||||||
|
|
||||||
for ( algo = raid6_algos ; *algo ; algo++ ) {
|
for (algo = raid6_algos; *algo; algo++) {
|
||||||
if ( !(*algo)->valid || (*algo)->valid() ) {
|
if (!(*algo)->valid || (*algo)->valid()) {
|
||||||
raid6_call = **algo;
|
raid6_call = **algo;
|
||||||
|
|
||||||
/* Nuke syndromes */
|
/* Nuke syndromes */
|
||||||
memset(data[NDISKS-2], 0xee, 2*PAGE_SIZE);
|
memset(data[NDISKS-2], 0xee, 2*PAGE_SIZE);
|
||||||
|
|
||||||
/* Generate assumed good syndrome */
|
/* Generate assumed good syndrome */
|
||||||
raid6_call.gen_syndrome(NDISKS, PAGE_SIZE, (void **)&dataptrs);
|
raid6_call.gen_syndrome(NDISKS, PAGE_SIZE,
|
||||||
|
(void **)&dataptrs);
|
||||||
|
|
||||||
for ( i = 0 ; i < NDISKS-1 ; i++ ) {
|
for (i = 0; i < NDISKS-1; i++)
|
||||||
for ( j = i+1 ; j < NDISKS ; j++ ) {
|
for (j = i+1; j < NDISKS; j++)
|
||||||
memset(recovi, 0xf0, PAGE_SIZE);
|
err += test_disks(i, j);
|
||||||
memset(recovj, 0xba, PAGE_SIZE);
|
|
||||||
|
|
||||||
dataptrs[i] = recovi;
|
|
||||||
dataptrs[j] = recovj;
|
|
||||||
|
|
||||||
raid6_dual_recov(NDISKS, PAGE_SIZE, i, j, (void **)&dataptrs);
|
|
||||||
|
|
||||||
erra = memcmp(data[i], recovi, PAGE_SIZE);
|
|
||||||
errb = memcmp(data[j], recovj, PAGE_SIZE);
|
|
||||||
|
|
||||||
if ( i < NDISKS-2 && j == NDISKS-1 ) {
|
|
||||||
/* We don't implement the DQ failure scenario, since it's
|
|
||||||
equivalent to a RAID-5 failure (XOR, then recompute Q) */
|
|
||||||
} else {
|
|
||||||
printf("algo=%-8s faila=%3d(%c) failb=%3d(%c) %s\n",
|
|
||||||
raid6_call.name,
|
|
||||||
i, (i==NDISKS-2)?'P':'D',
|
|
||||||
j, (j==NDISKS-1)?'Q':(j==NDISKS-2)?'P':'D',
|
|
||||||
(!erra && !errb) ? "OK" :
|
|
||||||
!erra ? "ERRB" :
|
|
||||||
!errb ? "ERRA" :
|
|
||||||
"ERRAB");
|
|
||||||
}
|
|
||||||
|
|
||||||
dataptrs[i] = data[i];
|
|
||||||
dataptrs[j] = data[j];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
printf("\n");
|
printf("\n");
|
||||||
}
|
}
|
||||||
|
@ -99,5 +117,8 @@ int main(int argc, char *argv[])
|
||||||
/* Pick the best algorithm test */
|
/* Pick the best algorithm test */
|
||||||
raid6_select_algo();
|
raid6_select_algo();
|
||||||
|
|
||||||
return 0;
|
if (err)
|
||||||
|
printf("\n*** ERRORS FOUND ***\n");
|
||||||
|
|
||||||
|
return err;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue