On Mon, Dec 8, 2008 at 2:57 PM, Yuri Tikhonov <yur@xxxxxxxxxxx> wrote:
> Rewrite handle_stripe_dirtying6 function to work asynchronously.
>
> Signed-off-by: Yuri Tikhonov <yur@xxxxxxxxxxx>
> Signed-off-by: Ilya Yanok <yanok@xxxxxxxxxxx>
> ---
> drivers/md/raid5.c | 113 ++++++++++++++--------------------------------------
> 1 files changed, 30 insertions(+), 83 deletions(-)
>
> diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
> index e08ed4f..f0b47bd 100644
> --- a/drivers/md/raid5.c
> +++ b/drivers/md/raid5.c
> @@ -2485,99 +2485,46 @@ static void handle_stripe_dirtying6(raid5_conf_t *conf,
> struct stripe_head *sh, struct stripe_head_state *s,
> struct r6_state *r6s, int disks)
> {
> - int rcw = 0, must_compute = 0, pd_idx = sh->pd_idx, i;
> + int rcw = 0, pd_idx = sh->pd_idx, i;
> int qd_idx = r6s->qd_idx;
> +
> + set_bit(STRIPE_HANDLE, &sh->state);
> for (i = disks; i--; ) {
> struct r5dev *dev = &sh->dev[i];
> - /* Would I have to read this buffer for reconstruct_write */
> - if (!test_bit(R5_OVERWRITE, &dev->flags)
> - && i != pd_idx && i != qd_idx
> - && (!test_bit(R5_LOCKED, &dev->flags)
> - ) &&
> - !test_bit(R5_UPTODATE, &dev->flags)) {
> - if (test_bit(R5_Insync, &dev->flags)) rcw++;
> - else {
> - pr_debug("raid6: must_compute: "
> - "disk %d flags=%#lx\n", i, dev->flags);
> - must_compute++;
> + /* check if we haven't enough data */
> + if (!test_bit(R5_OVERWRITE, &dev->flags) &&
> + i != pd_idx && i != qd_idx &&
> + !test_bit(R5_LOCKED, &dev->flags) &&
> + !(test_bit(R5_UPTODATE, &dev->flags) ||
> + test_bit(R5_Wantcompute, &dev->flags))) {
> + rcw++;
> + if (!test_bit(R5_Insync, &dev->flags))
> + continue; /* it's a failed drive */
> +
> + if (
> + test_bit(STRIPE_PREREAD_ACTIVE, &sh->state)) {
> + pr_debug("Read_old stripe %llu "
> + "block %d for Reconstruct\n",
> + (unsigned long long)sh->sector, i);
> + set_bit(R5_LOCKED, &dev->flags);
> + set_bit(R5_Wantread, &dev->flags);
> + s->locked++;
> + } else {
> + pr_debug("Request delayed stripe %llu "
> + "block %d for Reconstruct\n",
> + (unsigned long long)sh->sector, i);
> + set_bit(STRIPE_DELAYED, &sh->state);
> + set_bit(STRIPE_HANDLE, &sh->state);
What's the reasoning behind changing the logic here, i.e. removing
must_compute and such? I'd feel more comfortable seeing copy and
paste where possible with cleanups separated out into their own patch.
--
Dan
--
To unsubscribe from this list: send the line "unsubscribe linux-raid" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
