From a5191a47a7607c22ea79db5a5362c44d4848d8d2 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Sat, 16 Jun 2007 10:16:06 -0700
Subject: [PATCH] --- yaml --- r: 57842 b: refs/heads/master c:
 af03b8e4e81c3789e597632268940edd11ffe870 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/md/raid10.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fd41263c2d80..0a9bedd0425e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edad01e2a1c527af3baf22dc6977aeb058881150
+refs/heads/master: af03b8e4e81c3789e597632268940edd11ffe870
diff --git a/trunk/drivers/md/raid10.c b/trunk/drivers/md/raid10.c
index 82249a69014f..9eb66c1b523b 100644
--- a/trunk/drivers/md/raid10.c
+++ b/trunk/drivers/md/raid10.c
@@ -1867,6 +1867,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
 			int d = r10_bio->devs[i].devnum;
 			bio = r10_bio->devs[i].bio;
 			bio->bi_end_io = NULL;
+			clear_bit(BIO_UPTODATE, &bio->bi_flags);
 			if (conf->mirrors[d].rdev == NULL ||
 			    test_bit(Faulty, &conf->mirrors[d].rdev->flags))
 				continue;
@@ -2037,6 +2038,11 @@ static int run(mddev_t *mddev)
 	/* 'size' is now the number of chunks in the array */
 	/* calculate "used chunks per device" in 'stride' */
 	stride = size * conf->copies;
+
+	/* We need to round up when dividing by raid_disks to
+	 * get the stride size.
+	 */
+	stride += conf->raid_disks - 1;
 	sector_div(stride, conf->raid_disks);
 	mddev->size = stride  << (conf->chunk_shift-1);