Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

[pandora-kernel.git] / drivers / md / raid10.h

diff --git a/drivers/md/raid10.h b/drivers/md/raid10.h
index 59cd1ef..3824a08 100644 (file)
--- a/drivers/md/raid10.h
+++ b/drivers/md/raid10.h
@@ -33,9 +33,16 @@ 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;
 
+       int                     scale_disks;  /* When starting array, multiply
+                                              * each ->raid_disk by this.
+                                              * Need for raid0->raid10 migration
+                                              */
+
        struct list_head        retry_list;
        /* queue pending writes and submit them on unplug */
        struct bio_list         pending_bio_list;
@@ -57,6 +64,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;