Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / include / linux / raid / md_k.h

diff --git a/include/linux/raid/md_k.h b/include/linux/raid/md_k.h
index d288902..e2df61f 100644 (file)
--- a/include/linux/raid/md_k.h
+++ b/include/linux/raid/md_k.h
@@ -40,8 +40,7 @@ typedef struct mdk_rdev_s mdk_rdev_t;
  * options passed in raidrun:
  */
 
-/* Currently this must fix in an 'int' */
-#define MAX_CHUNK_SIZE (1<<30)
+#define MAX_CHUNK_SIZE (4096*1024)
 
 /*
  * MD's 'extended' device
@@ -58,7 +57,6 @@ struct mdk_rdev_s
 
        struct page     *sb_page;
        int             sb_loaded;
-       __u64           sb_events;
        sector_t        data_offset;    /* start of data in array */
        sector_t        sb_offset;
        int             sb_size;        /* bytes in the superblock */
@@ -89,10 +87,6 @@ struct mdk_rdev_s
                                         * array and could again if we did a partial
                                         * resync from the bitmap
                                         */
-       sector_t        recovery_offset;/* If this device has been partially
-                                        * recovered, this is where we were
-                                        * up to.
-                                        */
 
        atomic_t        nr_pending;     /* number of pending requests.
                                         * only maintained for arrays that
@@ -148,10 +142,9 @@ struct mddev_s
 
        struct mdk_thread_s             *thread;        /* management thread */
        struct mdk_thread_s             *sync_thread;   /* doing resync or reconstruct */
-       sector_t                        curr_resync;    /* last block scheduled */
+       sector_t                        curr_resync;    /* blocks scheduled */
        unsigned long                   resync_mark;    /* a recent timestamp */
        sector_t                        resync_mark_cnt;/* blocks written at resync_mark */
-       sector_t                        curr_mark_cnt; /* blocks scheduled now */
 
        sector_t                        resync_max_sectors; /* may be set by personality */
 
@@ -189,8 +182,6 @@ struct mddev_s
 #define        MD_RECOVERY_REQUESTED   6
 #define        MD_RECOVERY_CHECK       7
 #define MD_RECOVERY_RESHAPE    8
-#define        MD_RECOVERY_FROZEN      9
-
        unsigned long                   recovery;
 
        int                             in_sync;        /* know to not need resync */