From a8e026c785b3fecef0ef5c00c15223542c4db8f5 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Thu, 12 Aug 2010 06:44:54 +1000
Subject: [PATCH] Further tidyup of raid6 naming in lib/raid6

Rename raid6/raid6x86.h to raid6/x86.h
and modify some comments.

Signed-off-by: NeilBrown <neilb@suse.de>
---
 lib/raid6/algos.c               | 2 +-
 lib/raid6/mmx.c                 | 6 +++---
 lib/raid6/recov.c               | 2 +-
 lib/raid6/sse1.c                | 6 +++---
 lib/raid6/sse2.c                | 4 ++--
 lib/raid6/{raid6x86.h => x86.h} | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename lib/raid6/{raid6x86.h => x86.h} (99%)

diff --git a/lib/raid6/algos.c b/lib/raid6/algos.c
index df7ff72777b..b595f560bee 100644
--- a/lib/raid6/algos.c
+++ b/lib/raid6/algos.c
@@ -11,7 +11,7 @@
  * ----------------------------------------------------------------------- */
 
 /*
- * raid6algos.c
+ * raid6/algos.c
  *
  * Algorithm list and algorithm selection for RAID-6
  */
diff --git a/lib/raid6/mmx.c b/lib/raid6/mmx.c
index e7f6c13132b..279347f2309 100644
--- a/lib/raid6/mmx.c
+++ b/lib/raid6/mmx.c
@@ -11,7 +11,7 @@
  * ----------------------------------------------------------------------- */
 
 /*
- * raid6mmx.c
+ * raid6/mmx.c
  *
  * MMX implementation of RAID-6 syndrome functions
  */
@@ -19,9 +19,9 @@
 #if defined(__i386__) && !defined(__arch_um__)
 
 #include <linux/raid/pq.h>
-#include "raid6x86.h"
+#include "x86.h"
 
-/* Shared with raid6sse1.c */
+/* Shared with raid6/sse1.c */
 const struct raid6_mmx_constants {
 	u64 x1d;
 } raid6_mmx_constants = {
diff --git a/lib/raid6/recov.c b/lib/raid6/recov.c
index 2609f00e0d6..8590d19cf52 100644
--- a/lib/raid6/recov.c
+++ b/lib/raid6/recov.c
@@ -11,7 +11,7 @@
  * ----------------------------------------------------------------------- */
 
 /*
- * raid6recov.c
+ * raid6/recov.c
  *
  * RAID-6 data recovery in dual failure mode.  In single failure mode,
  * use the RAID-5 algorithm (or, in the case of Q failure, just reconstruct
diff --git a/lib/raid6/sse1.c b/lib/raid6/sse1.c
index b274dd5eab8..10dd91948c0 100644
--- a/lib/raid6/sse1.c
+++ b/lib/raid6/sse1.c
@@ -11,7 +11,7 @@
  * ----------------------------------------------------------------------- */
 
 /*
- * raid6sse1.c
+ * raid6/sse1.c
  *
  * SSE-1/MMXEXT implementation of RAID-6 syndrome functions
  *
@@ -24,9 +24,9 @@
 #if defined(__i386__) && !defined(__arch_um__)
 
 #include <linux/raid/pq.h>
-#include "raid6x86.h"
+#include "x86.h"
 
-/* Defined in raid6mmx.c */
+/* Defined in raid6/mmx.c */
 extern const struct raid6_mmx_constants {
 	u64 x1d;
 } raid6_mmx_constants;
diff --git a/lib/raid6/sse2.c b/lib/raid6/sse2.c
index 6ed6c6c0389..bc2d57daa58 100644
--- a/lib/raid6/sse2.c
+++ b/lib/raid6/sse2.c
@@ -11,7 +11,7 @@
  * ----------------------------------------------------------------------- */
 
 /*
- * raid6sse2.c
+ * raid6/sse2.c
  *
  * SSE-2 implementation of RAID-6 syndrome functions
  *
@@ -20,7 +20,7 @@
 #if (defined(__i386__) || defined(__x86_64__)) && !defined(__arch_um__)
 
 #include <linux/raid/pq.h>
-#include "raid6x86.h"
+#include "x86.h"
 
 static const struct raid6_sse_constants {
 	u64 x1d[2];
diff --git a/lib/raid6/raid6x86.h b/lib/raid6/x86.h
similarity index 99%
rename from lib/raid6/raid6x86.h
rename to lib/raid6/x86.h
index 4c22c156855..cb2a8c91c88 100644
--- a/lib/raid6/raid6x86.h
+++ b/lib/raid6/x86.h
@@ -11,7 +11,7 @@
  * ----------------------------------------------------------------------- */
 
 /*
- * raid6x86.h
+ * raid6/x86.h
  *
  * Definitions common to x86 and x86-64 RAID-6 code only
  */
-- 
2.39.3