Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=66c811e99322767bad5db4368de93aac604f02a2
Commit:     66c811e99322767bad5db4368de93aac604f02a2
Parent:     98ec302be52cc8a9cc0f3072126367273dbaf865
Author:     H. Peter Anvin <[EMAIL PROTECTED]>
AuthorDate: Wed Feb 6 01:39:48 2008 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Feb 6 10:41:18 2008 -0800

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Neil Brown <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/md/raid6test/test.c |  227 +++++++++++++++++++++++-------------------
 1 files changed, 124 insertions(+), 103 deletions(-)

diff --git a/drivers/md/raid6test/test.c b/drivers/md/raid6test/test.c
dissimilarity index 63%
index 0d5cd57..559cc41 100644
--- a/drivers/md/raid6test/test.c
+++ b/drivers/md/raid6test/test.c
@@ -1,103 +1,124 @@
-/* -*- linux-c -*- ------------------------------------------------------- *
- *
- *   Copyright 2002 H. Peter Anvin - All Rights Reserved
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, Inc., 53 Temple Place Ste 330,
- *   Bostom MA 02111-1307, USA; either version 2 of the License, or
- *   (at your option) any later version; incorporated herein by reference.
- *
- * ----------------------------------------------------------------------- */
-
-/*
- * raid6test.c
- *
- * Test RAID-6 recovery with various algorithms
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include "raid6.h"
-
-#define NDISKS         16      /* Including P and Q */
-
-const char raid6_empty_zero_page[PAGE_SIZE] __attribute__((aligned(256)));
-struct raid6_calls raid6_call;
-
-char *dataptrs[NDISKS];
-char data[NDISKS][PAGE_SIZE];
-char recovi[PAGE_SIZE], recovj[PAGE_SIZE];
-
-void makedata(void)
-{
-       int i, j;
-
-       for (  i = 0 ; i < NDISKS ; i++ ) {
-               for ( j = 0 ; j < PAGE_SIZE ; j++ ) {
-                       data[i][j] = rand();
-               }
-               dataptrs[i] = data[i];
-       }
-}
-
-int main(int argc, char *argv[])
-{
-       const struct raid6_calls * const * algo;
-       int i, j;
-       int erra, errb;
-
-       makedata();
-
-       for ( algo = raid6_algos ; *algo ; algo++ ) {
-               if ( !(*algo)->valid || (*algo)->valid() ) {
-                       raid6_call = **algo;
-
-                       /* Nuke syndromes */
-                       memset(data[NDISKS-2], 0xee, 2*PAGE_SIZE);
-
-                       /* Generate assumed good syndrome */
-                       raid6_call.gen_syndrome(NDISKS, PAGE_SIZE, (void 
**)&dataptrs);
-
-                       for ( i = 0 ; i < NDISKS-1 ; i++ ) {
-                               for ( j = i+1 ; j < NDISKS ; j++ ) {
-                                       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) */
-                                       } 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");
-       /* Pick the best algorithm test */
-       raid6_select_algo();
-
-       return 0;
-}
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright 2002-2007 H. Peter Anvin - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2 or (at your
+ *   option) any later version; incorporated herein by reference.
+ *
+ * ----------------------------------------------------------------------- */
+
+/*
+ * raid6test.c
+ *
+ * Test RAID-6 recovery with various algorithms
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "raid6.h"
+
+#define NDISKS         16      /* Including P and Q */
+
+const char raid6_empty_zero_page[PAGE_SIZE] __attribute__((aligned(256)));
+struct raid6_calls raid6_call;
+
+char *dataptrs[NDISKS];
+char data[NDISKS][PAGE_SIZE];
+char recovi[PAGE_SIZE], recovj[PAGE_SIZE];
+
+static void makedata(void)
+{
+       int i, j;
+
+       for (i = 0; i < NDISKS; i++) {
+               for (j = 0; j < PAGE_SIZE; j++)
+                       data[i][j] = rand();
+
+               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[])
+{
+       const struct raid6_calls *const *algo;
+       int i, j;
+       int err = 0;
+
+       makedata();
+
+       for (algo = raid6_algos; *algo; algo++) {
+               if (!(*algo)->valid || (*algo)->valid()) {
+                       raid6_call = **algo;
+
+                       /* Nuke syndromes */
+                       memset(data[NDISKS-2], 0xee, 2*PAGE_SIZE);
+
+                       /* Generate assumed good syndrome */
+                       raid6_call.gen_syndrome(NDISKS, PAGE_SIZE,
+                                               (void **)&dataptrs);
+
+                       for (i = 0; i < NDISKS-1; i++)
+                               for (j = i+1; j < NDISKS; j++)
+                                       err += test_disks(i, j);
+               }
+               printf("\n");
+       }
+
+       printf("\n");
+       /* Pick the best algorithm test */
+       raid6_select_algo();
+
+       if (err)
+               printf("\n*** ERRORS FOUND ***\n");
+
+       return err;
+}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to