Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757937AbXJ0UW1 (ORCPT ); Sat, 27 Oct 2007 16:22:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753055AbXJ0UWT (ORCPT ); Sat, 27 Oct 2007 16:22:19 -0400 Received: from caramon.arm.linux.org.uk ([78.32.30.218]:43925 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752740AbXJ0UWT (ORCPT ); Sat, 27 Oct 2007 16:22:19 -0400 Date: Sat, 27 Oct 2007 21:17:00 +0100 From: Russell King To: Al Viro Cc: Linus Torvalds , axboe@kernel.dk, linux-kernel@vger.kernel.org Subject: Re: [PATCH] scatterlist fallout: drivers/scsi/arm/ Message-ID: <20071027201700.GC22235@flint.arm.linux.org.uk> References: <20071027184404.GQ8181@ftp.linux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20071027184404.GQ8181@ftp.linux.org.uk> User-Agent: Mutt/1.4.2.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2678 Lines: 66 On Sat, Oct 27, 2007 at 07:44:04PM +0100, Al Viro wrote: > > Signed-off-by: Al Viro > --- > 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 King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/