Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/include/linux/raid/raid5.h b/include/linux/raid/raid5.h
index f025ba6fb14c..394da8207b34 100644
--- a/include/linux/raid/raid5.h
+++ b/include/linux/raid/raid5.h
@@ -126,7 +126,7 @@
  */
 
 struct stripe_head {
-        struct stripe_head      *hash_next, **hash_pprev; /* hash pointers */
+        struct hlist_node       hash;
         struct list_head        lru;                    /* inactive_list or handle_list */
         struct raid5_private_data       *raid_conf;
         sector_t                sector;                 /* sector of this row */
@@ -152,7 +152,6 @@ struct stripe_head {
 #define R5_Insync       3       /* rdev && rdev->in_sync at start */
 #define R5_Wantread     4       /* want to schedule a read */
 #define R5_Wantwrite    5
-#define R5_Syncio       6       /* this io need to be accounted as resync io */
 #define R5_Overlap      7       /* There is a pending overlapping request on this block */
 #define R5_ReadError    8       /* seen a read error here recently */
 #define R5_ReWrite      9       /* have tried to over-write the readerror */
@@ -205,7 +204,7 @@ struct disk_info {
 };
 
 struct raid5_private_data {
-        struct stripe_head      **stripe_hashtbl;
+        struct hlist_head       *stripe_hashtbl;
         mddev_t                 *mddev;
         struct disk_info        *spare;
         int                     chunk_size, level, algorithm;
@@ -228,6 +227,8 @@ struct raid5_private_data {
                                             * Cleared when a sync completes.
                                             */
 
+        struct page             *spare_page; /* Used when checking P/Q in raid6 */
+
         /*
          * Free stripes pool
          */