Merge branch 'for-linus' of git://neil.brown.name/md

* 'for-linus' of git://neil.brown.name/md: (34 commits)
  md: Fix some bugs in recovery_disabled handling.
  md/raid5: fix bug that could result in reads from a failed device.
  lib/raid6: Fix filename emitted in generated code
  md.c: trivial comment fix
  MD: Allow restarting an interrupted incremental recovery.
  md: clear In_sync bit on devices added to an active array.
  md: add proper write-congestion reporting to RAID1 and RAID10.
  md: rename "mdk_personality" to "md_personality"
  md/bitmap remove fault injection options.
  md/raid5: typedef removal: raid5_conf_t -> struct r5conf
  md/raid1: typedef removal: conf_t -> struct r1conf
  md/raid10: typedef removal: conf_t -> struct r10conf
  md/raid0: typedef removal: raid0_conf_t -> struct r0conf
  md/multipath: typedef removal: multipath_conf_t -> struct mpconf
  md/linear: typedef removal: linear_conf_t -> struct linear_conf
  md/faulty: remove typedef: conf_t -> struct faulty_conf
  md/linear: remove typedefs: dev_info_t -> struct dev_info
  md: remove typedefs: mirror_info_t -> struct mirror_info
  md: remove typedefs: r10bio_t -> struct r10bio and r1bio_t -> struct r1bio
  md: remove typedefs: mdk_thread_t -> struct md_thread
  ...

diff --combined drivers/md/dm-raid.c
index 86df8b2,220aefc..37a3726
--- 1/drivers/md/dm-raid.c
--- 2/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@@ -37,7 -37,7 +37,7 @@@ struct raid_dev 
         */
        struct dm_dev *meta_dev;
        struct dm_dev *data_dev;
-       struct mdk_rdev_s rdev;
+       struct md_rdev rdev;
  };
  
  /*
@@@ -57,7 -57,7 +57,7 @@@ struct raid_set 
  
        uint64_t print_flags;
  
-       struct mddev_s md;
+       struct mddev md;
        struct raid_type *raid_type;
        struct dm_target_callbacks callbacks;
  
@@@ -449,7 -449,7 +449,7 @@@ static int parse_raid_params(struct rai
                                rs->ti->error = "write_mostly option is only valid for RAID1";
                                return -EINVAL;
                        }
 -                      if (value > rs->md.raid_disks) {
 +                      if (value >= rs->md.raid_disks) {
                                rs->ti->error = "Invalid write_mostly drive index given";
                                return -EINVAL;
                        }
@@@ -594,7 -594,7 +594,7 @@@ struct dm_raid_superblock 
                                /* Always set to 0 when writing. */
  } __packed;
  
- static int read_disk_sb(mdk_rdev_t *rdev, int size)
+ static int read_disk_sb(struct md_rdev *rdev, int size)
  {
        BUG_ON(!rdev->sb_page);
  
@@@ -611,9 -611,9 +611,9 @@@
        return 0;
  }
  
- static void super_sync(mddev_t *mddev, mdk_rdev_t *rdev)
+ static void super_sync(struct mddev *mddev, struct md_rdev *rdev)
  {
-       mdk_rdev_t *r, *t;
+       struct md_rdev *r, *t;
        uint64_t failed_devices;
        struct dm_raid_superblock *sb;
  
@@@ -651,7 -651,7 +651,7 @@@
   *
   * Return: 1 if use rdev, 0 if use refdev, -Exxx otherwise
   */
- static int super_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev)
+ static int super_load(struct md_rdev *rdev, struct md_rdev *refdev)
  {
        int ret;
        struct dm_raid_superblock *sb;
@@@ -689,7 -689,7 +689,7 @@@
        return (events_sb > events_refsb) ? 1 : 0;
  }
  
- static int super_init_validation(mddev_t *mddev, mdk_rdev_t *rdev)
+ static int super_init_validation(struct mddev *mddev, struct md_rdev *rdev)
  {
        int role;
        struct raid_set *rs = container_of(mddev, struct raid_set, md);
@@@ -698,7 -698,7 +698,7 @@@
        struct dm_raid_superblock *sb;
        uint32_t new_devs = 0;
        uint32_t rebuilds = 0;
-       mdk_rdev_t *r, *t;
+       struct md_rdev *r, *t;
        struct dm_raid_superblock *sb2;
  
        sb = page_address(rdev->sb_page);
@@@ -809,7 -809,7 +809,7 @@@
        return 0;
  }
  
- static int super_validate(mddev_t *mddev, mdk_rdev_t *rdev)
+ static int super_validate(struct mddev *mddev, struct md_rdev *rdev)
  {
        struct dm_raid_superblock *sb = page_address(rdev->sb_page);
  
@@@ -849,8 -849,8 +849,8 @@@
  static int analyse_superblocks(struct dm_target *ti, struct raid_set *rs)
  {
        int ret;
-       mdk_rdev_t *rdev, *freshest, *tmp;
-       mddev_t *mddev = &rs->md;
+       struct md_rdev *rdev, *freshest, *tmp;
+       struct mddev *mddev = &rs->md;
  
        freshest = NULL;
        rdev_for_each(rdev, tmp, mddev) {
@@@ -1004,7 -1004,7 +1004,7 @@@ static void raid_dtr(struct dm_target *
  static int raid_map(struct dm_target *ti, struct bio *bio, union map_info *map_context)
  {
        struct raid_set *rs = ti->private;
-       mddev_t *mddev = &rs->md;
+       struct mddev *mddev = &rs->md;
  
        mddev->pers->make_request(mddev, bio);
  
@@@ -1097,7 -1097,7 +1097,7 @@@ static int raid_status(struct dm_targe
                               rs->md.bitmap_info.max_write_behind);
  
                if (rs->print_flags & DMPF_STRIPE_CACHE) {
-                       raid5_conf_t *conf = rs->md.private;
+                       struct r5conf *conf = rs->md.private;
  
                        /* convert from kiB to sectors */
                        DMEMIT(" stripe_cache %d",
@@@ -1146,7 -1146,7 +1146,7 @@@ static void raid_io_hints(struct dm_tar
  {
        struct raid_set *rs = ti->private;
        unsigned chunk_size = rs->md.chunk_sectors << 9;
-       raid5_conf_t *conf = rs->md.private;
+       struct r5conf *conf = rs->md.private;
  
        blk_limits_io_min(limits, chunk_size);
        blk_limits_io_opt(limits, chunk_size * (conf->raid_disks - conf->max_degraded));