Re: [PATCH 1/4] sg traverse fix for __atapi_pio_bytes()

[Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>]

Hi,

On 6/6/05, Albert Lee <albertcc@tw.ibm.com> wrote:
> Hi Jeff,
> 
> Problem:
>    Incorrect md5sum when using ATAPI PIO mode to verify a distro CD.
> 
> Root cause:
>    sg traverse problem.
> In __atapi_pio_bytes(), if qc->cursg++ is increased and "goto next_page" is executed,
> then sg is not updated to the new qc->cursg and the old sg is overwritten with the new data.
> 
> Changes:
> - Replace "goto next_page" with "goto next_sg" to make sg updated.
> 
>    Attached please find the patch against the linux-2.6.git tree for your review. Thanks.
> 
> Albert
> 
> Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
> 
> 
> 
> --- 10_atapi_pio_fix/drivers/scsi/libata-core.c 2005-06-06 13:37:50.000000000 +0800
> +++ 11_atapi_pio_sg_fix/drivers/scsi/libata-core.c      2005-06-06 13:45:33.000000000 +0800
> @@ -2577,7 +2577,6 @@
>  next_sg:
>         sg = &qc->sg[qc->cursg];
> 
> -next_page:
>         page = sg->page;
>         offset = sg->offset + qc->cursg_ofs;
> 
> @@ -2585,6 +2584,7 @@
>         page = nth_page(page, (offset >> PAGE_SHIFT));
>         offset %= PAGE_SIZE;
> 
> +       /* don't overrun current sg */
>         count = min(sg->length - qc->cursg_ofs, bytes);
> 
>         /* don't cross page boundaries */
> @@ -2609,8 +2609,6 @@
>         kunmap(page);
> 
>         if (bytes) {
> -               if (qc->cursg_ofs < sg->length)
> -                       goto next_page;
>                 goto next_sg;
>         }
>  }
> 

Looks good.  Jeff, please apply.

Ack-ed by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>

Minor CodingStyle nitpick - braces can be dropped:

        if (bytes)
                goto next_sg;

Bartlomiej