1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/md/md.h b/drivers/md/md.h
index 1c2063ccf48e..7b4a3c318cae 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -55,6 +55,7 @@ struct md_rdev {
         int             sb_loaded;
         __u64           sb_events;
         sector_t        data_offset;    /* start of data in array */
+        sector_t        new_data_offset;/* only relevant while reshaping */
         sector_t        sb_start;       /* offset of the super block (in 512byte sectors) */
         int             sb_size;        /* bytes in the superblock */
         int             preferred_minor;        /* autorun support */
@@ -193,8 +194,9 @@ static inline int is_badblock(struct md_rdev *rdev, sector_t s, int sectors,
         return 0;
 }
 extern int rdev_set_badblocks(struct md_rdev *rdev, sector_t s, int sectors,
-                              int acknowledged);
-extern int rdev_clear_badblocks(struct md_rdev *rdev, sector_t s, int sectors);
+                              int is_new);
+extern int rdev_clear_badblocks(struct md_rdev *rdev, sector_t s, int sectors,
+                                int is_new);
 extern void md_ack_all_badblocks(struct badblocks *bb);
 
 struct mddev {
@@ -262,6 +264,7 @@ struct mddev {
         sector_t                        reshape_position;
         int                             delta_disks, new_level, new_layout;
         int                             new_chunk_sectors;
+        int                             reshape_backwards;
 
         atomic_t                        plug_cnt;       /* If device is expecting
                                                          * more bios soon.
@@ -390,10 +393,13 @@ struct mddev {
                                                  * For external metadata, offset
                                                  * from start of device. 
                                                  */
+                unsigned long           space; /* space available at this offset */
                 loff_t                  default_offset; /* this is the offset to use when
                                                          * hot-adding a bitmap.  It should
                                                          * eventually be settable by sysfs.
                                                          */
+                unsigned long           default_space; /* space available at
+                                                        * default offset */
                 struct mutex            mutex;
                 unsigned long           chunksize;
                 unsigned long           daemon_sleep; /* how many jiffies between updates? */
@@ -591,6 +597,7 @@ extern void md_write_start(struct mddev *mddev, struct bio *bi);
 extern void md_write_end(struct mddev *mddev);
 extern void md_done_sync(struct mddev *mddev, int blocks, int ok);
 extern void md_error(struct mddev *mddev, struct md_rdev *rdev);
+extern void md_finish_reshape(struct mddev *mddev);
 
 extern int mddev_congested(struct mddev *mddev, int bits);
 extern void md_flush_request(struct mddev *mddev, struct bio *bio);
@@ -615,6 +622,7 @@ extern int md_run(struct mddev *mddev);
 extern void md_stop(struct mddev *mddev);
 extern void md_stop_writes(struct mddev *mddev);
 extern int md_rdev_init(struct md_rdev *rdev);
+extern void md_rdev_clear(struct md_rdev *rdev);
 
 extern void mddev_suspend(struct mddev *mddev);
 extern void mddev_resume(struct mddev *mddev);