From: Jens Axboe <jens.axboe@oracle.com>
To: Russell King <rmk+lkml@arm.linux.org.uk>
Cc: Al Viro <viro@ftp.linux.org.uk>,
Linus Torvalds <torvalds@linux-foundation.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] scatterlist fallout: drivers/scsi/arm/
Date: Mon, 29 Oct 2007 10:12:06 +0100 [thread overview]
Message-ID: <20071029091206.GE5467@kernel.dk> (raw)
In-Reply-To: <20071029090710.GB7801@flint.arm.linux.org.uk>
On Mon, Oct 29 2007, Russell King wrote:
> On Mon, Oct 29, 2007 at 09:59:36AM +0100, Jens Axboe wrote:
> > 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?
>
> It's already merged into the ARM git tree as of Friday. Waiting for
> ack's from various people for other merged patches before sending the
> set to Linus.
Great, thanks.
--
Jens Axboe
next prev parent reply other threads:[~2007-10-29 9:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-27 18:44 [PATCH] scatterlist fallout: drivers/scsi/arm/ Al Viro
2007-10-27 19:21 ` Russell King
2007-10-27 20:17 ` Russell King
2007-10-28 5:20 ` Linus Torvalds
2007-10-29 8:59 ` Jens Axboe
2007-10-29 9:07 ` Russell King
2007-10-29 9:12 ` Jens Axboe [this message]
2007-10-29 9:21 ` Al Viro
2007-10-29 9:36 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071029091206.GE5467@kernel.dk \
--to=jens.axboe@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rmk+lkml@arm.linux.org.uk \
--cc=torvalds@linux-foundation.org \
--cc=viro@ftp.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox