diff --git a/[refs] b/[refs] index 5e75f51411ce..ecc5fa05c7cc 100644 --- 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 index 8f58a447d9f0..1fa70c34b7d2 100644 --- 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