1 files changed, 34 insertions, 8 deletions

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 7301631abe04..e293d92641ac 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -18,10 +18,13 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "dm-bio-list.h"
 #include <linux/delay.h>
-#include <linux/raid/raid10.h>
-#include <linux/raid/bitmap.h>
+#include <linux/blkdev.h>
+#include <linux/seq_file.h>
+#include "md.h"
+#include "dm-bio-list.h"
+#include "raid10.h"
+#include "bitmap.h"
 
 /*
  * RAID10 provides a combination of RAID0 and RAID1 functionality.
@@ -1695,7 +1698,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
                         return 0;
 
  skipped:
-        max_sector = mddev->size << 1;
+        max_sector = mddev->dev_sectors;
         if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery))
                 max_sector = mddev->resync_max_sectors;
         if (sector_nr >= max_sector) {
@@ -2020,6 +2023,25 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
         goto skipped;
 }
 
+static sector_t
+raid10_size(mddev_t *mddev, sector_t sectors, int raid_disks)
+{
+        sector_t size;
+        conf_t *conf = mddev_to_conf(mddev);
+
+        if (!raid_disks)
+                raid_disks = mddev->raid_disks;
+        if (!sectors)
+                sectors = mddev->dev_sectors;
+
+        size = sectors >> conf->chunk_shift;
+        sector_div(size, conf->far_copies);
+        size = size * raid_disks;
+        sector_div(size, conf->near_copies);
+
+        return size << conf->chunk_shift;
+}
+
 static int run(mddev_t *mddev)
 {
         conf_t *conf;
@@ -2076,7 +2098,7 @@ static int run(mddev_t *mddev)
         conf->far_offset = fo;
         conf->chunk_mask = (sector_t)(mddev->chunk_size>>9)-1;
         conf->chunk_shift = ffz(~mddev->chunk_size) - 9;
-        size = mddev->size >> (conf->chunk_shift-1);
+        size = mddev->dev_sectors >> conf->chunk_shift;
         sector_div(size, fc);
         size = size * conf->raid_disks;
         sector_div(size, nc);
@@ -2089,7 +2111,7 @@ static int run(mddev_t *mddev)
          */
         stride += conf->raid_disks - 1;
         sector_div(stride, conf->raid_disks);
-        mddev->size = stride  << (conf->chunk_shift-1);
+        mddev->dev_sectors = stride << conf->chunk_shift;
 
         if (fo)
                 stride = 1;
@@ -2171,8 +2193,8 @@ static int run(mddev_t *mddev)
         /*
          * Ok, everything is just fine now
          */
-        mddev->array_sectors = size << conf->chunk_shift;
-        mddev->resync_max_sectors = size << conf->chunk_shift;
+        md_set_array_sectors(mddev, raid10_size(mddev, 0, 0));
+        mddev->resync_max_sectors = raid10_size(mddev, 0, 0);
 
         mddev->queue->unplug_fn = raid10_unplug;
         mddev->queue->backing_dev_info.congested_fn = raid10_congested;
@@ -2208,6 +2230,9 @@ static int stop(mddev_t *mddev)
 {
         conf_t *conf = mddev_to_conf(mddev);
 
+        raise_barrier(conf, 0);
+        lower_barrier(conf);
+
         md_unregister_thread(mddev->thread);
         mddev->thread = NULL;
         blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/
@@ -2255,6 +2280,7 @@ static struct mdk_personality raid10_personality =
         .spare_active   = raid10_spare_active,
         .sync_request   = sync_request,
         .quiesce        = raid10_quiesce,
+        .size           = raid10_size,
 };
 
 static int __init raid_init(void)