diff --git a/[refs] b/[refs]
index 6c0a9201ef9f..96e4c03bedcb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce25c31bdd3b39266debd86a7732007e05983a67
+refs/heads/master: 8838832830d2c6c28ae2db93188ae90652eb7fc2
diff --git a/trunk/drivers/md/raid10.c b/trunk/drivers/md/raid10.c
index 4db34edfd87f..7f636283a1ba 100644
--- a/trunk/drivers/md/raid10.c
+++ b/trunk/drivers/md/raid10.c
@@ -2060,7 +2060,13 @@ static int run(mddev_t *mddev)
 	/*
 	 * Ok, everything is just fine now
 	 */
-	size = conf->stride * conf->raid_disks;
+	if (conf->far_offset) {
+		size = mddev->size >> (conf->chunk_shift-1);
+		size *= conf->raid_disks;
+		size <<= conf->chunk_shift;
+		sector_div(size, conf->far_copies);
+	} else
+		size = conf->stride * conf->raid_disks;
 	sector_div(size, conf->near_copies);
 	mddev->array_size = size/2;
 	mddev->resync_max_sectors = size;