From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757420AbYFAXfk (ORCPT ); Sun, 1 Jun 2008 19:35:40 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756906AbYFAX3K (ORCPT ); Sun, 1 Jun 2008 19:29:10 -0400 Received: from rv-out-0506.google.com ([209.85.198.231]:25723 "EHLO rv-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753986AbYFAX3H (ORCPT ); Sun, 1 Jun 2008 19:29:07 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:references:user-agent:date:from:to:cc:subject:content-disposition; b=e5TP9n42G20TMzgJtVja18adcyEy6WblJ91CG1PYdgmwYlKYQVlJX397y7HTasRzWO0kEB3hk2FZGlypczc07A+ACG+UXPLlUt5U6eXXgjBG4R+aKjeJaHmlfkkprR+H3KO8crzuS6DctE5niZ8Wu1qNcxCvs8Y/ItFNdvwCP8g= Message-Id: <20080601231653.012518474@gmail.com> References: <20080601231329.223608711@gmail.com> User-Agent: quilt/0.46-1 Date: Mon, 02 Jun 2008 08:13:52 +0900 From: akinobu.mita@gmail.com To: linux-kernel@vger.kernel.org Cc: Andrew Vasquez , "James E.J. Bottomley" , linux-scsi@vger.kernel.org Subject: [patch -v2 23/23] qla2xxx: use memory_read_from_buffer Content-Disposition: inline; filename=scsi-qla2xxx-use-memory-read-from-buffer.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Akinobu Mita Cc: Andrew Vasquez Cc: James E.J. Bottomley Cc: linux-scsi@vger.kernel.org --- drivers/scsi/qla2xxx/qla_attr.c | 45 ++++++++-------------------------------- 1 file changed, 10 insertions(+), 35 deletions(-) Index: 2.6-git/drivers/scsi/qla2xxx/qla_attr.c =================================================================== --- 2.6-git.orig/drivers/scsi/qla2xxx/qla_attr.c +++ 2.6-git/drivers/scsi/qla2xxx/qla_attr.c @@ -8,6 +8,7 @@ #include #include +#include static int qla24xx_vport_disable(struct fc_vport *, bool); @@ -20,18 +21,12 @@ qla2x00_sysfs_read_fw_dump(struct kobjec { struct scsi_qla_host *ha = shost_priv(dev_to_shost(container_of(kobj, struct device, kobj))); - char *rbuf = (char *)ha->fw_dump; if (ha->fw_dump_reading == 0) return 0; - if (off > ha->fw_dump_len) - return 0; - if (off + count > ha->fw_dump_len) - count = ha->fw_dump_len - off; - memcpy(buf, &rbuf[off], count); - - return (count); + return memory_read_from_buffer(buf, count, &off, ha->fw_dump, + ha->fw_dump_len); } static ssize_t @@ -91,20 +86,13 @@ qla2x00_sysfs_read_nvram(struct kobject { struct scsi_qla_host *ha = shost_priv(dev_to_shost(container_of(kobj, struct device, kobj))); - int size = ha->nvram_size; - char *nvram_cache = ha->nvram; - if (!capable(CAP_SYS_ADMIN) || off > size || count == 0) + if (!capable(CAP_SYS_ADMIN)) return 0; - if (off + count > size) { - size -= off; - count = size; - } /* Read NVRAM data from cache. */ - memcpy(buf, &nvram_cache[off], count); - - return count; + return memory_read_from_buffer(buf, count, &off, ha->nvram, + ha->nvram_size); } static ssize_t @@ -172,14 +160,9 @@ qla2x00_sysfs_read_optrom(struct kobject if (ha->optrom_state != QLA_SREADING) return 0; - if (off > ha->optrom_region_size) - return 0; - if (off + count > ha->optrom_region_size) - count = ha->optrom_region_size - off; - memcpy(buf, &ha->optrom_buffer[off], count); - - return count; + return memory_read_from_buffer(buf, count, &off, ha->optrom_buffer, + ha->optrom_region_size); } static ssize_t @@ -371,20 +354,12 @@ qla2x00_sysfs_read_vpd(struct kobject *k { struct scsi_qla_host *ha = shost_priv(dev_to_shost(container_of(kobj, struct device, kobj))); - int size = ha->vpd_size; - char *vpd_cache = ha->vpd; - if (!capable(CAP_SYS_ADMIN) || off > size || count == 0) + if (!capable(CAP_SYS_ADMIN)) return 0; - if (off + count > size) { - size -= off; - count = size; - } /* Read NVRAM data from cache. */ - memcpy(buf, &vpd_cache[off], count); - - return count; + return memory_read_from_buffer(buf, count, &off, ha->vpd, ha->vpd_size); } static ssize_t --