---

yaml --- r: 16539 b: refs/heads/master c: 18f0881 h: refs/heads/master i: 16537: 08ac512 16535: a3d0126 v: v3
git-mirror · Jan 6, 2006 · efa4388 · efa4388
1 parent 988df00
commit efa4388
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9910f16af35419a5382fa7850eecc220103036fa
+refs/heads/master: 18f08819f42b647783e4f6ea99141623881bf182
diff --git a/trunk/drivers/md/raid10.c b/trunk/drivers/md/raid10.c
@@ -1206,6 +1206,10 @@ static void sync_request_write(mddev_t *mddev, r10bio_t *r10_bio)
 				break;
 		if (j == vcnt)
 			continue;
+		mddev->resync_mismatches += r10_bio->sectors;
+		if (test_bit(MD_RECOVERY_CHECK, &mddev->recovery))
+			/* Don't fix anything. */
+			continue;
 		/* Ok, we need to write this bio
 		 * First we need to fixup bv_offset, bv_len and
 		 * bi_vecs, as the read request might have corrupted these