adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

md: fix problems with RAID6 calculations for DDF.

Browse source 
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2009-10-16 16:27:34 +11:00
parent 417b8d4ac8
commit e4424fee18
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/md/raid5.c
View file

@ -158,10 +158,13 @@ static int raid6_idx_to_slot(int idx, struct stripe_head *sh,
{ {
int slot; int slot;
if (sh->ddf_layout)
slot = (*count)++;
if (idx == sh->pd_idx) if (idx == sh->pd_idx)
return syndrome_disks; return syndrome_disks;
if (idx == sh->qd_idx) if (idx == sh->qd_idx)
return syndrome_disks + 1; return syndrome_disks + 1;
if (!sh->ddf_layout)
slot = (*count)++; slot = (*count)++;
return slot; return slot;
} }
@ -727,9 +730,8 @@ static int set_syndrome_sources(struct page **srcs, struct stripe_head *sh)
srcs[slot] = sh->dev[i].page; srcs[slot] = sh->dev[i].page;
i = raid6_next_disk(i, disks); i = raid6_next_disk(i, disks);
} while (i != d0_idx); } while (i != d0_idx);
BUG_ON(count != syndrome_disks);
return count; return syndrome_disks;
} }
static struct dma_async_tx_descriptor * static struct dma_async_tx_descriptor *
@ -828,7 +830,6 @@ ops_run_compute6_2(struct stripe_head *sh, struct raid5_percpu *percpu)
failb = slot; failb = slot;
i = raid6_next_disk(i, disks); i = raid6_next_disk(i, disks);
} while (i != d0_idx); } while (i != d0_idx);
BUG_ON(count != syndrome_disks);
BUG_ON(faila == failb); BUG_ON(faila == failb);
if (failb < faila) if (failb < faila)
@ -845,7 +846,7 @@ ops_run_compute6_2(struct stripe_head *sh, struct raid5_percpu *percpu)
init_async_submit(&submit, ASYNC_TX_FENCE, NULL, init_async_submit(&submit, ASYNC_TX_FENCE, NULL,
ops_complete_compute, sh, ops_complete_compute, sh,
to_addr_conv(sh, percpu)); to_addr_conv(sh, percpu));
return async_gen_syndrome(blocks, 0, count+2, return async_gen_syndrome(blocks, 0, syndrome_disks+2,
STRIPE_SIZE, &submit); STRIPE_SIZE, &submit);
} else { } else {
struct page *dest; struct page *dest;
@ -1935,10 +1936,15 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i, int previous)
case ALGORITHM_PARITY_N: case ALGORITHM_PARITY_N:
break; break;
case ALGORITHM_ROTATING_N_CONTINUE: case ALGORITHM_ROTATING_N_CONTINUE:
/* Like left_symmetric, but P is before Q */
if (sh->pd_idx == 0) if (sh->pd_idx == 0)
i--; /* P D D D Q */ i--; /* P D D D Q */
else if (i > sh->pd_idx) else {
i -= 2; /* D D Q P D */ /* D D Q P D */
if (i < sh->pd_idx)
i += raid_disks;
i -= (sh->pd_idx + 1);
}
break; break;
case ALGORITHM_LEFT_ASYMMETRIC_6: case ALGORITHM_LEFT_ASYMMETRIC_6:
case ALGORITHM_RIGHT_ASYMMETRIC_6: case ALGORITHM_RIGHT_ASYMMETRIC_6:

2
drivers/md/raid5.h
View file

@ -488,7 +488,7 @@ static inline int algorithm_valid_raid6(int layout)
{ {
return (layout >= 0 && layout <= 5) return (layout >= 0 && layout <= 5)
|| ||
(layout == 8 || layout == 10) (layout >= 8 && layout <= 10)
|| ||
(layout >= 16 && layout <= 20); (layout >= 16 && layout <= 20);
} }