From bfeee2b55f4639429e66b63444f45423eda0d259 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Mon, 9 Jan 2012 01:41:51 +1100
Subject: [PATCH] --- yaml --- r: 283401 b: refs/heads/master c:
 307729c8bc5b5a41361af8af95906eee7552acb1 h: refs/heads/master i:   283399:
 509021bc0a4e88321cb80c3b5d3204cda8dd4b8a v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/md/raid1.c | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7acd99c2d2f8..67cc8915e989 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2a371c5e74dd5685ab47effa4ac7b23b1fdaae5
+refs/heads/master: 307729c8bc5b5a41361af8af95906eee7552acb1
diff --git a/trunk/drivers/md/raid1.c b/trunk/drivers/md/raid1.c
index cc24f0cb7ee3..a368db2431a5 100644
--- a/trunk/drivers/md/raid1.c
+++ b/trunk/drivers/md/raid1.c
@@ -531,8 +531,17 @@ static int read_balance(struct r1conf *conf, struct r1bio *r1_bio, int *max_sect
 		if (test_bit(WriteMostly, &rdev->flags)) {
 			/* Don't balance among write-mostly, just
 			 * use the first as a last resort */
-			if (best_disk < 0)
+			if (best_disk < 0) {
+				if (is_badblock(rdev, this_sector, sectors,
+						&first_bad, &bad_sectors)) {
+					if (first_bad < this_sector)
+						/* Cannot use this */
+						continue;
+					best_good_sectors = first_bad - this_sector;
+				} else
+					best_good_sectors = sectors;
 				best_disk = disk;
+			}
 			continue;
 		}
 		/* This is a reasonable device to use.  It might