Re: [PATCH 06/10] ips: use sg buffer copy helper funcitons

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



ACK

Sincerely -- Mark Salyzyn

On Mar 8, 2008, at 11:44 PM, FUJITA Tomonori wrote:

This rewrites ips_scmd_buf_write/read with scsi_sg_copy_from/to_buffer
respectively.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
Cc: Salyzyn, Mark <Mark_Salyzyn@xxxxxxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx>
---
drivers/scsi/ips.c | 50 +++++++ +------------------------------------------
1 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 6264036..cc4f44f 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -3502,28 +3502,11 @@ ips_send_wait(ips_ha_t * ha, ips_scb_t * scb, int timeout, int intr)
static void
ips_scmd_buf_write(struct scsi_cmnd *scmd, void *data, unsigned int count)
{
-        int i;
-        unsigned int min_cnt, xfer_cnt;
-        char *cdata = (char *) data;
-        unsigned char *buffer;
-        unsigned long flags;
-        struct scatterlist *sg = scsi_sglist(scmd);
-
-        for (i = 0, xfer_cnt = 0;
-       (i < scsi_sg_count(scmd)) && (xfer_cnt < count);
-             i++, sg = sg_next(sg)) {
-                min_cnt = min(count - xfer_cnt, sg->length);
-
- /* kmap_atomic() ensures addressability of the data buffer.*/ - /* local_irq_save() protects the KM_IRQ0 address slot. */
-                local_irq_save(flags);
- buffer = kmap_atomic(sg_page(sg), KM_IRQ0) + sg- >offset;
-                memcpy(buffer, &cdata[xfer_cnt], min_cnt);
-               kunmap_atomic(buffer - sg->offset, KM_IRQ0);
-                local_irq_restore(flags);
+       unsigned long flags;

-                xfer_cnt += min_cnt;
-        }
+       local_irq_save(flags);
+       scsi_sg_copy_from_buffer(scmd, data, count);
+       local_irq_restore(flags);
}

/ ****************************************************************************/ @@ -3536,28 +3519,11 @@ ips_scmd_buf_write(struct scsi_cmnd *scmd, void *data, unsigned int count)
static void
ips_scmd_buf_read(struct scsi_cmnd *scmd, void *data, unsigned int count)
{
-        int i;
-        unsigned int min_cnt, xfer_cnt;
-        char *cdata = (char *) data;
-        unsigned char *buffer;
-        unsigned long flags;
-        struct scatterlist *sg = scsi_sglist(scmd);
-
-        for (i = 0, xfer_cnt = 0;
-             (i < scsi_sg_count(scmd)) && (xfer_cnt < count);
-             i++, sg = sg_next(sg)) {
-               min_cnt = min(count - xfer_cnt, sg->length);
-
- /* kmap_atomic() ensures addressability of the data buffer.*/ - /* local_irq_save() protects the KM_IRQ0 address slot. */
-                local_irq_save(flags);
- buffer = kmap_atomic(sg_page(sg), KM_IRQ0) + sg- >offset;
-                memcpy(&cdata[xfer_cnt], buffer, min_cnt);
-               kunmap_atomic(buffer - sg->offset, KM_IRQ0);
-                local_irq_restore(flags);
+       unsigned long flags;

-                xfer_cnt += min_cnt;
-        }
+       local_irq_save(flags);
+       scsi_sg_copy_to_buffer(scmd, data, count);
+       local_irq_restore(flags);
}

/ ****************************************************************************/
--
1.5.3.7


--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [SCSI Target Devel]     [Linux SCSI Target Infrastructure]     [Kernel Newbies]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Linux IIO]     [Samba]     [Device Mapper]
  Powered by Linux