Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

[net-next-2.6.git] / drivers / md / raid10.h

diff --git a/drivers/md/raid10.h b/drivers/md/raid10.h
index 59cd1efb8d304cc5c394f05cdfc7e650ebf9186a..2316ac2e8e218c6a97c96ebd35d99172e0bcb4fc 100644 (file)
--- a/drivers/md/raid10.h
+++ b/drivers/md/raid10.h
@@ -33,6 +33,8 @@ struct r10_private_data_s {
                                               * 1 stripe.
                                               */
 
+       sector_t                dev_sectors;  /* temp copy of mddev->dev_sectors */
+
        int chunk_shift; /* shift from chunks to sectors */
        sector_t chunk_mask;
 
@@ -57,6 +59,11 @@ struct r10_private_data_s {
        mempool_t *r10bio_pool;
        mempool_t *r10buf_pool;
        struct page             *tmppage;
+
+       /* When taking over an array from a different personality, we store
+        * the new thread here until we fully activate the array.
+        */
+       struct mdk_thread_s     *thread;
 };
 
 typedef struct r10_private_data_s conf_t;