From: Neil Brown Date: Tue, 30 Jan 2007 23:53:52 +0000 (+0100) Subject: Make 'repair' actually work for raid1. X-Git-Tag: v2.6.16.40-rc1~7 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=346c9b5d4fde30eae1cbcdb4bc62f9e1d0ddfd13;p=karo-tx-linux.git Make 'repair' actually work for raid1. When 'repair' finds a block that is different one the various parts of the mirror. it is meant to write a chosen good version to the others. However it currently writes out the original data to each. The memcpy to make all the data the same is missing. Also correct a test so that 'repair' causes a repair, rather than anything other then 'repair'. Signed-off-by: Neil Brown Signed-off-by: Adrian Bunk --- diff --git a/drivers/md/md.c b/drivers/md/md.c index 2fd2cd4470a6..adf27f232838 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -2193,7 +2193,7 @@ action_store(mddev_t *mddev, const char *page, size_t len) else { if (cmd_match(page, "check")) set_bit(MD_RECOVERY_CHECK, &mddev->recovery); - else if (cmd_match(page, "repair")) + else if (!cmd_match(page, "repair")) return -EINVAL; set_bit(MD_RECOVERY_REQUESTED, &mddev->recovery); set_bit(MD_RECOVERY_SYNC, &mddev->recovery); diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index f0b7caa4a878..59cd546cdecb 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -1215,6 +1215,11 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio) sbio->bi_sector = r1_bio->sector + conf->mirrors[i].rdev->data_offset; sbio->bi_bdev = conf->mirrors[i].rdev->bdev; + for (j = 0; j < vcnt ; j++) + memcpy(page_address(sbio->bi_io_vec[j].bv_page), + page_address(pbio->bi_io_vec[j].bv_page), + PAGE_SIZE); + } } }