1 files changed, 26 insertions, 9 deletions

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index e2466425d9ca..b4f4badc0068 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -31,10 +31,13 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "dm-bio-list.h"
 #include <linux/delay.h>
-#include <linux/raid/raid1.h>
-#include <linux/raid/bitmap.h>
+#include <linux/blkdev.h>
+#include <linux/seq_file.h>
+#include "md.h"
+#include "dm-bio-list.h"
+#include "raid1.h"
+#include "bitmap.h"
 
 #define DEBUG 0
 #if DEBUG
@@ -1723,7 +1726,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
                         return 0;
         }
 
-        max_sector = mddev->size << 1;
+        max_sector = mddev->dev_sectors;
         if (sector_nr >= max_sector) {
                 /* If we aborted, we need to abort the
                  * sync on the 'current' bitmap chunk (there will
@@ -1919,6 +1922,14 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
         return nr_sectors;
 }
 
+static sector_t raid1_size(mddev_t *mddev, sector_t sectors, int raid_disks)
+{
+        if (sectors)
+                return sectors;
+
+        return mddev->dev_sectors;
+}
+
 static int run(mddev_t *mddev)
 {
         conf_t *conf;
@@ -2048,7 +2059,7 @@ static int run(mddev_t *mddev)
         /*
          * Ok, everything is just fine now
          */
-        mddev->array_sectors = mddev->size * 2;
+        md_set_array_sectors(mddev, raid1_size(mddev, 0, 0));
 
         mddev->queue->unplug_fn = raid1_unplug;
         mddev->queue->backing_dev_info.congested_fn = raid1_congested;
@@ -2089,6 +2100,9 @@ static int stop(mddev_t *mddev)
                 /* need to kick something here to make sure I/O goes? */
         }
 
+        raise_barrier(conf);
+        lower_barrier(conf);
+
         md_unregister_thread(mddev->thread);
         mddev->thread = NULL;
         blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/
@@ -2110,15 +2124,17 @@ static int raid1_resize(mddev_t *mddev, sector_t sectors)
          * any io in the removed space completes, but it hardly seems
          * worth it.
          */
-        mddev->array_sectors = sectors;
+        md_set_array_sectors(mddev, raid1_size(mddev, sectors, 0));
+        if (mddev->array_sectors > raid1_size(mddev, sectors, 0))
+                return -EINVAL;
         set_capacity(mddev->gendisk, mddev->array_sectors);
         mddev->changed = 1;
-        if (mddev->array_sectors / 2 > mddev->size &&
+        if (sectors > mddev->dev_sectors &&
             mddev->recovery_cp == MaxSector) {
-                mddev->recovery_cp = mddev->size << 1;
+                mddev->recovery_cp = mddev->dev_sectors;
                 set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
         }
-        mddev->size = mddev->array_sectors / 2;
+        mddev->dev_sectors = sectors;
         mddev->resync_max_sectors = sectors;
         return 0;
 }
@@ -2264,6 +2280,7 @@ static struct mdk_personality raid1_personality =
         .spare_active   = raid1_spare_active,
         .sync_request   = sync_request,
         .resize         = raid1_resize,
+        .size           = raid1_size,
         .check_reshape  = raid1_reshape,
         .quiesce        = raid1_quiesce,
 };