1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/md/md.h b/drivers/md/md.h
index 8227ab909d44..9430a110db93 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -30,13 +30,6 @@ typedef struct mddev_s mddev_t;
 typedef struct mdk_rdev_s mdk_rdev_t;
 
 /*
- * options passed in raidrun:
- */
-
-/* Currently this must fit in an 'int' */
-#define MAX_CHUNK_SIZE (1<<30)
-
-/*
  * MD's 'extended' device
  */
 struct mdk_rdev_s
@@ -145,7 +138,7 @@ struct mddev_s
         int                             external;       /* metadata is
                                                          * managed externally */
         char                            metadata_type[17]; /* externally set*/
-        int                             chunk_size;
+        int                             chunk_sectors;
         time_t                          ctime, utime;
         int                             level, layout;
         char                            clevel[16];
@@ -166,7 +159,8 @@ struct mddev_s
          * If reshape_position is MaxSector, then no reshape is happening (yet).
          */
         sector_t                        reshape_position;
-        int                             delta_disks, new_level, new_layout, new_chunk;
+        int                             delta_disks, new_level, new_layout;
+        int                             new_chunk_sectors;
 
         struct mdk_thread_s             *thread;        /* management thread */
         struct mdk_thread_s             *sync_thread;   /* doing resync or reconstruct */
@@ -325,7 +319,6 @@ struct mdk_personality
         int (*check_reshape) (mddev_t *mddev);
         int (*start_reshape) (mddev_t *mddev);
         void (*finish_reshape) (mddev_t *mddev);
-        int (*reconfig) (mddev_t *mddev, int layout, int chunk_size);
         /* quiesce moves between quiescence states
          * 0 - fully active
          * 1 - no new requests allowed
@@ -437,5 +430,6 @@ extern void md_new_event(mddev_t *mddev);
 extern int md_allow_write(mddev_t *mddev);
 extern void md_wait_for_blocked_rdev(mdk_rdev_t *rdev, mddev_t *mddev);
 extern void md_set_array_sectors(mddev_t *mddev, sector_t array_sectors);
+extern int md_check_no_bitmap(mddev_t *mddev);
 
 #endif /* _MD_MD_H */