2 files changed, 29 insertions, 4 deletions

diff --git a/include/linux/raid/md_p.h b/include/linux/raid/md_p.h
index 8c0a3adc5df5..ee753536ab70 100644
--- a/include/linux/raid/md_p.h
+++ b/include/linux/raid/md_p.h
@@ -233,7 +233,10 @@ struct mdp_superblock_1 {
         __le32  delta_disks;    /* change in number of raid_disks               */
         __le32  new_layout;     /* new layout                                   */
         __le32  new_chunk;      /* new chunk size (512byte sectors)             */
-        __u8    pad1[128-124];  /* set to 0 when written */
+        __le32  new_offset;     /* signed number to add to data_offset in new
+                                 * layout.  0 == no-change.  This can be
+                                 * different on each device in the array.
+                                 */
 
         /* constant this-device information - 64 bytes */
         __le64  data_offset;    /* sector start of data, often 0 */
@@ -281,10 +284,18 @@ struct mdp_superblock_1 {
                                             * active device with same 'role'.
                                             * 'recovery_offset' is also set.
                                             */
+#define MD_FEATURE_RESHAPE_BACKWARDS    32 /* Reshape doesn't change number
+                                            * of devices, but is going
+                                            * backwards anyway.
+                                            */
+#define MD_FEATURE_NEW_OFFSET           64 /* new_offset must be honoured */
 #define MD_FEATURE_ALL                  (MD_FEATURE_BITMAP_OFFSET       \
                                         |MD_FEATURE_RECOVERY_OFFSET     \
                                         |MD_FEATURE_RESHAPE_ACTIVE      \
                                         |MD_FEATURE_BAD_BLOCKS          \
-                                        |MD_FEATURE_REPLACEMENT)
+                                        |MD_FEATURE_REPLACEMENT         \
+                                        |MD_FEATURE_RESHAPE_BACKWARDS   \
+                                        |MD_FEATURE_NEW_OFFSET          \
+                                        )
 
 #endif 
diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h
index 53272e9860a7..640c69ceec96 100644
--- a/include/linux/raid/pq.h
+++ b/include/linux/raid/pq.h
@@ -99,8 +99,20 @@ extern const struct raid6_calls raid6_altivec2;
 extern const struct raid6_calls raid6_altivec4;
 extern const struct raid6_calls raid6_altivec8;
 
+struct raid6_recov_calls {
+        void (*data2)(int, size_t, int, int, void **);
+        void (*datap)(int, size_t, int, void **);
+        int  (*valid)(void);
+        const char *name;
+        int priority;
+};
+
+extern const struct raid6_recov_calls raid6_recov_intx1;
+extern const struct raid6_recov_calls raid6_recov_ssse3;
+
 /* Algorithm list */
 extern const struct raid6_calls * const raid6_algos[];
+extern const struct raid6_recov_calls *const raid6_recov_algos[];
 int raid6_select_algo(void);
 
 /* Return values from chk_syndrome */
@@ -111,14 +123,16 @@ int raid6_select_algo(void);
 
 /* Galois field tables */
 extern const u8 raid6_gfmul[256][256] __attribute__((aligned(256)));
+extern const u8 raid6_vgfmul[256][32] __attribute__((aligned(256)));
 extern const u8 raid6_gfexp[256]      __attribute__((aligned(256)));
 extern const u8 raid6_gfinv[256]      __attribute__((aligned(256)));
 extern const u8 raid6_gfexi[256]      __attribute__((aligned(256)));
 
 /* Recovery routines */
-void raid6_2data_recov(int disks, size_t bytes, int faila, int failb,
+extern void (*raid6_2data_recov)(int disks, size_t bytes, int faila, int failb,
                        void **ptrs);
-void raid6_datap_recov(int disks, size_t bytes, int faila, void **ptrs);
+extern void (*raid6_datap_recov)(int disks, size_t bytes, int faila,
+                        void **ptrs);
 void raid6_dual_recov(int disks, size_t bytes, int faila, int failb,
                       void **ptrs);