Merge tag 'md-3.5' of git://neil.brown.name/md

Pull md updates from NeilBrown:
 "It's been a busy cycle for md - lots of fun stuff here..  if you like
  this kind of thing :-)

  Main features:
   - RAID10 arrays can be reshaped - adding and removing devices and
     changing chunks (not 'far' array though)
   - allow RAID5 arrays to be reshaped with a backup file (not tested
     yet, but the priciple works fine for RAID10).
   - arrays can be reshaped while a bitmap is present - you no longer
     need to remove it first
   - SSSE3 support for RAID6 syndrome calculations

  and of course a number of minor fixes etc."

* tag 'md-3.5' of git://neil.brown.name/md: (56 commits)
  md/bitmap: record the space available for the bitmap in the superblock.
  md/raid10: Remove extras after reshape to smaller number of devices.
  md/raid5: improve removal of extra devices after reshape.
  md: check the return of mddev_find()
  MD RAID1: Further conditionalize 'fullsync'
  DM RAID: Use md_error() in place of simply setting Faulty bit
  DM RAID: Record and handle missing devices
  DM RAID: Set recovery flags on resume
  md/raid5: Allow reshape while a bitmap is present.
  md/raid10: resize bitmap when required during reshape.
  md: allow array to be resized while bitmap is present.
  md/bitmap: make sure reshape request are reflected in superblock.
  md/bitmap: add bitmap_resize function to allow bitmap resizing.
  md/bitmap: use DIV_ROUND_UP instead of open-code
  md/bitmap: create a 'struct bitmap_counts' substructure of 'struct bitmap'
  md/bitmap: make bitmap bitops atomic.
  md/bitmap: make _page_attr bitops atomic.
  md/bitmap: merge bitmap_file_unmap and bitmap_file_put.
  md/bitmap: remove async freeing of bitmap file.
  md/bitmap: convert some spin_lock_irqsave to spin_lock_irq
  ...

1 files changed, 16 insertions, 6 deletions

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 15dd59b84e94..835de7168cd3 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1859,7 +1859,9 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
 
                         rdev = conf->mirrors[d].rdev;
                         if (rdev &&
-                            test_bit(In_sync, &rdev->flags) &&
+                            (test_bit(In_sync, &rdev->flags) ||
+                             (!test_bit(Faulty, &rdev->flags) &&
+                              rdev->recovery_offset >= sect + s)) &&
                             is_badblock(rdev, sect, s,
                                         &first_bad, &bad_sectors) == 0 &&
                             sync_page_io(rdev, sect, s<<9,
@@ -2024,7 +2026,7 @@ static void handle_sync_write_finished(struct r1conf *conf, struct r1bio *r1_bio
                         continue;
                 if (test_bit(BIO_UPTODATE, &bio->bi_flags) &&
                     test_bit(R1BIO_MadeGood, &r1_bio->state)) {
-                        rdev_clear_badblocks(rdev, r1_bio->sector, s);
+                        rdev_clear_badblocks(rdev, r1_bio->sector, s, 0);
                 }
                 if (!test_bit(BIO_UPTODATE, &bio->bi_flags) &&
                     test_bit(R1BIO_WriteError, &r1_bio->state)) {
@@ -2044,7 +2046,7 @@ static void handle_write_finished(struct r1conf *conf, struct r1bio *r1_bio)
                         struct md_rdev *rdev = conf->mirrors[m].rdev;
                         rdev_clear_badblocks(rdev,
                                              r1_bio->sector,
-                                             r1_bio->sectors);
+                                             r1_bio->sectors, 0);
                         rdev_dec_pending(rdev, conf->mddev);
                 } else if (r1_bio->bios[m] != NULL) {
                         /* This drive got a write error.  We need to
@@ -2598,7 +2600,8 @@ static struct r1conf *setup_conf(struct mddev *mddev)
                 if (!disk->rdev ||
                     !test_bit(In_sync, &disk->rdev->flags)) {
                         disk->head_position = 0;
-                        if (disk->rdev)
+                        if (disk->rdev &&
+                            (disk->rdev->saved_raid_disk < 0))
                                 conf->fullsync = 1;
                 } else if (conf->last_used < 0)
                         /*
@@ -2750,9 +2753,16 @@ static int raid1_resize(struct mddev *mddev, sector_t sectors)
          * any io in the removed space completes, but it hardly seems
          * worth it.
          */
-        md_set_array_sectors(mddev, raid1_size(mddev, sectors, 0));
-        if (mddev->array_sectors > raid1_size(mddev, sectors, 0))
+        sector_t newsize = raid1_size(mddev, sectors, 0);
+        if (mddev->external_size &&
+            mddev->array_sectors > newsize)
                 return -EINVAL;
+        if (mddev->bitmap) {
+                int ret = bitmap_resize(mddev->bitmap, newsize, 0, 0);
+                if (ret)
+                        return ret;
+        }
+        md_set_array_sectors(mddev, newsize);
         set_capacity(mddev->gendisk, mddev->array_sectors);
         revalidate_disk(mddev->gendisk);
         if (sectors > mddev->dev_sectors &&