diff options
Diffstat (limited to 'drivers/md/raid10.c')
-rw-r--r-- | drivers/md/raid10.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index cd066b63bdaf..957a719e8c2f 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c | |||
@@ -2097,11 +2097,17 @@ static void sync_request_write(struct mddev *mddev, struct r10bio *r10_bio) | |||
2097 | * both 'first' and 'i', so we just compare them. | 2097 | * both 'first' and 'i', so we just compare them. |
2098 | * All vec entries are PAGE_SIZE; | 2098 | * All vec entries are PAGE_SIZE; |
2099 | */ | 2099 | */ |
2100 | for (j = 0; j < vcnt; j++) | 2100 | int sectors = r10_bio->sectors; |
2101 | for (j = 0; j < vcnt; j++) { | ||
2102 | int len = PAGE_SIZE; | ||
2103 | if (sectors < (len / 512)) | ||
2104 | len = sectors * 512; | ||
2101 | if (memcmp(page_address(fbio->bi_io_vec[j].bv_page), | 2105 | if (memcmp(page_address(fbio->bi_io_vec[j].bv_page), |
2102 | page_address(tbio->bi_io_vec[j].bv_page), | 2106 | page_address(tbio->bi_io_vec[j].bv_page), |
2103 | fbio->bi_io_vec[j].bv_len)) | 2107 | len)) |
2104 | break; | 2108 | break; |
2109 | sectors -= len/512; | ||
2110 | } | ||
2105 | if (j == vcnt) | 2111 | if (j == vcnt) |
2106 | continue; | 2112 | continue; |
2107 | atomic64_add(r10_bio->sectors, &mddev->resync_mismatches); | 2113 | atomic64_add(r10_bio->sectors, &mddev->resync_mismatches); |
@@ -3407,6 +3413,7 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, | |||
3407 | 3413 | ||
3408 | if (bio->bi_end_io == end_sync_read) { | 3414 | if (bio->bi_end_io == end_sync_read) { |
3409 | md_sync_acct(bio->bi_bdev, nr_sectors); | 3415 | md_sync_acct(bio->bi_bdev, nr_sectors); |
3416 | set_bit(BIO_UPTODATE, &bio->bi_flags); | ||
3410 | generic_make_request(bio); | 3417 | generic_make_request(bio); |
3411 | } | 3418 | } |
3412 | } | 3419 | } |