From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [patch 1/2] ipr: use memory_read_from_buffer() Date: Mon, 09 Jun 2008 16:37:22 -0700 Message-ID: <200806092337.m59NbMsX014861@imap1.linux-foundation.org> Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:54506 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757978AbYFIXhh (ORCPT ); Mon, 9 Jun 2008 19:37:37 -0400 Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: James.Bottomley@HansenPartnership.com Cc: linux-scsi@vger.kernel.org, akpm@linux-foundation.org, akinobu.mita@gmail.com, brking@us.ibm.com From: Akinobu Mita Signed-off-by: Akinobu Mita Cc: Brian King Cc: James E.J. Bottomley Signed-off-by: Andrew Morton --- 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 @@ -2455,20 +2455,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 = { _