From 0ca09e6c528885b5af9b2f614d62f50f79fc413a Mon Sep 17 00:00:00 2001 From: Doug Nazar Date: Fri, 7 Jan 2011 14:41:44 +0100 Subject: [PATCH] * grub-core/disk/raid5_recover.c (grub_raid5_recover): Add missing array->members[i].start_sector. * grub-core/disk/raid6_recover.c (grub_raid6_recover): Likewise. --- ChangeLog | 6 ++++++ grub-core/disk/raid5_recover.c | 4 +++- grub-core/disk/raid6_recover.c | 18 +++++++++++++----- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d734d86b6..c5cc7afa6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-01-07 Doug Nazar + + * grub-core/disk/raid5_recover.c (grub_raid5_recover): Add missing + array->members[i].start_sector. + * grub-core/disk/raid6_recover.c (grub_raid6_recover): Likewise. + 2011-01-07 Vladimir Serbinenko * util/grub-setup.c (setup): Handle NetBSD and OpenBSD disklabels. diff --git a/grub-core/disk/raid5_recover.c b/grub-core/disk/raid5_recover.c index 2cda67533..349eb0291 100644 --- a/grub-core/disk/raid5_recover.c +++ b/grub-core/disk/raid5_recover.c @@ -45,7 +45,9 @@ grub_raid5_recover (struct grub_raid_array *array, int disknr, if (i == disknr) continue; - err = grub_disk_read (array->members[i].device, sector, 0, size, buf2); + err = grub_disk_read (array->members[i].device, + array->members[i].start_sector + sector, + 0, size, buf2); if (err) { diff --git a/grub-core/disk/raid6_recover.c b/grub-core/disk/raid6_recover.c index 01daa2c79..dfaa60ea4 100644 --- a/grub-core/disk/raid6_recover.c +++ b/grub-core/disk/raid6_recover.c @@ -119,7 +119,8 @@ grub_raid6_recover (struct grub_raid_array *array, int disknr, int p, else { if ((array->members[pos].device) && - (! grub_disk_read (array->members[pos].device, sector, + (! grub_disk_read (array->members[pos].device, + array->members[i].start_sector + sector, 0, size, buf))) { grub_raid_block_xor (pbuf, buf, size); @@ -150,7 +151,9 @@ grub_raid6_recover (struct grub_raid_array *array, int disknr, int p, { /* One bad device */ if ((array->members[p].device) && - (! grub_disk_read (array->members[p].device, sector, 0, size, buf))) + (! grub_disk_read (array->members[p].device, + array->members[i].start_sector + sector, + 0, size, buf))) { grub_raid_block_xor (buf, pbuf, size); goto quit; @@ -163,7 +166,8 @@ grub_raid6_recover (struct grub_raid_array *array, int disknr, int p, } grub_errno = GRUB_ERR_NONE; - if (grub_disk_read (array->members[q].device, sector, 0, size, buf)) + if (grub_disk_read (array->members[q].device, + array->members[i].start_sector + sector, 0, size, buf)) goto quit; grub_raid_block_xor (buf, qbuf, size); @@ -181,12 +185,16 @@ grub_raid6_recover (struct grub_raid_array *array, int disknr, int p, goto quit; } - if (grub_disk_read (array->members[p].device, sector, 0, size, buf)) + if (grub_disk_read (array->members[p].device, + array->members[i].start_sector + sector, + 0, size, buf)) goto quit; grub_raid_block_xor (pbuf, buf, size); - if (grub_disk_read (array->members[q].device, sector, 0, size, buf)) + if (grub_disk_read (array->members[q].device, + array->members[i].start_sector + sector, + 0, size, buf)) goto quit; grub_raid_block_xor (qbuf, buf, size);