Re: [PATCH] scatterlist fallout: drivers/scsi/arm/

Jens Axboe
2007-10-29T09:02:10Z

On Sat, Oct 27 2007, Russell King wrote:
> On Sat, Oct 27, 2007 at 07:44:04PM +0100, Al Viro wrote:
> >
> > Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
> > ---
> > diff --git a/drivers/scsi/arm/scsi.h b/drivers/scsi/arm/scsi.h
> > index 21ba571..2d09fef 100644
> > --- a/drivers/scsi/arm/scsi.h
> > +++ b/drivers/scsi/arm/scsi.h
> > @@ -39,7 +39,7 @@ static inline int next_SCp(struct scsi_pointer *SCp)
> > SCp->buffer++;
> > SCp->buffers_residual--;
> > SCp->ptr = (char *)
> > - (page_address(SCp->buffer->page) +
> > + (page_address(sg_page(SCp->buffer)) +
> > SCp->buffer->offset);
> > SCp->this_residual = SCp->buffer->length;
> > } else {
> > @@ -77,7 +77,7 @@ static inline void init_SCp(struct scsi_cmnd *SCpnt)
> > SCpnt->SCp.buffer = (struct scatterlist *) SCpnt->request_buffer;
> > SCpnt->SCp.buffers_residual = SCpnt->use_sg - 1;
> > SCpnt->SCp.ptr = (char *)
> > - (page_address(SCpnt->SCp.buffer->page) +
> > + (page_address(sg_page(SCpnt->SCp.buffer)) +
> > SCpnt->SCp.buffer->offset);
> > SCpnt->SCp.this_residual = SCpnt->SCp.buffer->length;
> > SCpnt->SCp.phase = SCpnt->request_bufflen;
>
> FYI, here's what I have queued (cut'n'pasted so probably won't apply):
>
> diff --git a/drivers/scsi/arm/scsi.h b/drivers/scsi/arm/scsi.h
> index 21ba571..bb6550e 100644
> --- a/drivers/scsi/arm/scsi.h
> +++ b/drivers/scsi/arm/scsi.h
> @@ -38,9 +38,7 @@ static inline int next_SCp(struct scsi_pointer *SCp)
> if (ret) {
> SCp->buffer++;
> SCp->buffers_residual--;
> - SCp->ptr = (char *)
> - (page_address(SCp->buffer->page) +
> - SCp->buffer->offset);
> + SCp->ptr = sg_virt(SCp->buffer);
> SCp->this_residual = SCp->buffer->length;
> } else {
> SCp->ptr = NULL;
> @@ -76,9 +74,7 @@ static inline void init_SCp(struct scsi_cmnd *SCpnt)
>
> SCpnt->SCp.buffer = (struct scatterlist *) SCpnt->request_buffer;
> SCpnt->SCp.buffers_residual = SCpnt->use_sg - 1;
> - SCpnt->SCp.ptr = (char *)
> - (page_address(SCpnt->SCp.buffer->page) +
> - SCpnt->SCp.buffer->offset);
> + SCpnt->SCp.ptr = sg_virt(SCpnt->SCp.buffer);
> SCpnt->SCp.this_residual = SCpnt->SCp.buffer->length;
> SCpnt->SCp.phase = SCpnt->request_bufflen;

Russell, will you be merging this yourself or do you want me to include
it in the sg fixup branch?

--
Jens Axboe