[patch 09/17] ipr: use memory_read_from_buffer()

[patch 09/17] ipr: use memory_read_from_buffer()

[akpm]

From: Akinobu Mita <akinobu.mita@gmail.com>

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Brian King <brking@us.ibm.com>
Cc: James E.J. Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/scsi/ipr.c |   16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff -puN drivers/scsi/ipr.c~ipr-use-memory_read_from_buffer drivers/scsi/ipr.c
--- a/drivers/scsi/ipr.c~ipr-use-memory_read_from_buffer
+++ a/drivers/scsi/ipr.c
@@ -2456,20 +2456,14 @@ static ssize_t ipr_read_trace(struct kob
 	struct Scsi_Host *shost = class_to_shost(dev);
 	struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)shost->hostdata;
 	unsigned long lock_flags = 0;
-	int size = IPR_TRACE_SIZE;
-	char *src = (char *)ioa_cfg->trace;
-
-	if (off > size)
-		return 0;
-	if (off + count > size) {
-		size -= off;
-		count = size;
-	}
+	ssize_t ret;
 
 	spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
-	memcpy(buf, &src[off], count);
+	ret = memory_read_from_buffer(buf, count, &off, ioa_cfg->trace,
+				IPR_TRACE_SIZE);
 	spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
-	return count;
+
+	return ret;
 }
 
 static struct bin_attribute ipr_trace_attr = {
_

Re: [patch 09/17] ipr: use memory_read_from_buffer()

[James Bottomley]

On Mon, 2008-09-22 at 14:56 -0700, akpm@linux-foundation.org wrote:
> From: Akinobu Mita <akinobu.mita@gmail.com>
> 
> Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
> Cc: Brian King <brking@us.ibm.com>
> Cc: James E.J. Bottomley <James.Bottomley@HansenPartnership.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Brian,

Can I get an ack for this (or can you merge it into your patch set)?

Thanks,

James

Re: [patch 09/17] ipr: use memory_read_from_buffer()

[Brian King]

Acked by: Brian King <brking@linux.vnet.ibm.com>

akpm@linux-foundation.org wrote:
> From: Akinobu Mita <akinobu.mita@gmail.com>
> 
> Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
> Cc: Brian King <brking@us.ibm.com>
> Cc: James E.J. Bottomley <James.Bottomley@HansenPartnership.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
> 
>  drivers/scsi/ipr.c |   16 +++++-----------
>  1 file changed, 5 insertions(+), 11 deletions(-)
> 
> diff -puN drivers/scsi/ipr.c~ipr-use-memory_read_from_buffer drivers/scsi/ipr.c
> --- a/drivers/scsi/ipr.c~ipr-use-memory_read_from_buffer
> +++ a/drivers/scsi/ipr.c
> @@ -2456,20 +2456,14 @@ static ssize_t ipr_read_trace(struct kob
>  	struct Scsi_Host *shost = class_to_shost(dev);
>  	struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)shost->hostdata;
>  	unsigned long lock_flags = 0;
> -	int size = IPR_TRACE_SIZE;
> -	char *src = (char *)ioa_cfg->trace;
> -
> -	if (off > size)
> -		return 0;
> -	if (off + count > size) {
> -		size -= off;
> -		count = size;
> -	}
> +	ssize_t ret;
> 
>  	spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
> -	memcpy(buf, &src[off], count);
> +	ret = memory_read_from_buffer(buf, count, &off, ioa_cfg->trace,
> +				IPR_TRACE_SIZE);
>  	spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
> -	return count;
> +
> +	return ret;
>  }
> 
>  static struct bin_attribute ipr_trace_attr = {
> _
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html


-- 
Brian King
Linux on Power Virtualization
IBM Linux Technology Center