diff options
| author | Neil Brown <neilb@suse.de> | 2007-01-31 00:53:52 +0100 |
|---|---|---|
| committer | Adrian Bunk <bunk@stusta.de> | 2007-02-03 01:56:23 +0100 |
| commit | 346c9b5d4fde30eae1cbcdb4bc62f9e1d0ddfd13 (patch) | |
| tree | a7379505a42ef6a3dc1a1f4b842944c0dc5edccb | |
| parent | f69c6c18f688ef789beff30a8de809491c7609dd (diff) | |
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 <neilb@suse.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
| -rw-r--r-- | drivers/md/md.c | 2 | ||||
| -rw-r--r-- | drivers/md/raid1.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 2fd2cd4470a..adf27f23283 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 f0b7caa4a87..59cd546cdec 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); + } } } |