---

yaml --- r: 305932 b: refs/heads/master c: da8840a h: refs/heads/master v: v3
git-mirror · May 22, 2012 · 7943e93 · 7943e93
1 parent 2fa380a
commit 7943e93
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fa2f327681808f653711e14203a42cf4644bda0
+refs/heads/master: da8840a747c0dbf49506ec906757a6b87b9741e9
diff --git a/trunk/drivers/md/raid1.c b/trunk/drivers/md/raid1.c
@@ -1859,7 +1859,9 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
 
 			rdev = conf->mirrors[d].rdev;
 			if (rdev &&
-			    test_bit(In_sync, &rdev->flags) &&
+			    (test_bit(In_sync, &rdev->flags) ||
+			     (!test_bit(Faulty, &rdev->flags) &&
+			      rdev->recovery_offset >= sect + s)) &&
 			    is_badblock(rdev, sect, s,
 					&first_bad, &bad_sectors) == 0 &&
 			    sync_page_io(rdev, sect, s<<9,