[ofa-general] [Fwd: [PATCH 2/2] iscsi_iser: convert to use the data buffer accessors]

[Erez Zilber]

Roland,

Can you add the patch below to 2.6.23?

Thanks,
Erez

-------- Original Message --------
Subject: 	[PATCH 2/2] iscsi_iser: convert to use the data buffer accessors
Date: 	Fri, 1 Jun 2007 12:56:21 +0300
From: 	FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Reply-To: 	<open-iscsi at googlegroups.com>
To: 	<linux-scsi at vger.kernel.org>
CC: 	<James.Bottomley at steeleye.com>, <michaelc at cs.wisc.edu>,
<rdreier at cisco.com>, <open-iscsi at googlegroups.com>
References:
<dcbf60d819ad4d62643fc074968699563f25621b.1180539510.git.fujita.tomonori at lab.ntt.co.jp>




iscsi_iser: convert to use the data buffer accessors

- remove the unnecessary map_single path.

- convert to use the new accessors for the sg lists and the
parameters.

TODO: use scsi_for_each_sg().

Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Signed-off-by: Erez Zilber <erezz at voltaire.com>
---
 drivers/infiniband/ulp/iser/iscsi_iser.c     |    4 ++--
 drivers/infiniband/ulp/iser/iser_initiator.c |   14 ++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c
b/drivers/infiniband/ulp/iser/iscsi_iser.c
index 1bf173d..effdee2 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -210,10 +210,10 @@ iscsi_iser_ctask_xmit(struct iscsi_conn *conn,
        int error = 0;

        if (ctask->sc->sc_data_direction == DMA_TO_DEVICE) {
-               BUG_ON(ctask->sc->request_bufflen == 0);
+               BUG_ON(scsi_bufflen(ctask->sc) == 0);

                debug_scsi("cmd [itt %x total %d imm %d unsol_data %d\n",
-                          ctask->itt, ctask->sc->request_bufflen,
+                          ctask->itt, scsi_bufflen(ctask->sc),
                           ctask->imm_count, ctask->unsol_count);
        }

diff --git a/drivers/infiniband/ulp/iser/iser_initiator.c
b/drivers/infiniband/ulp/iser/iser_initiator.c
index 3651072..9ea5b9a 100644
--- a/drivers/infiniband/ulp/iser/iser_initiator.c
+++ b/drivers/infiniband/ulp/iser/iser_initiator.c
@@ -351,18 +351,12 @@ int iser_send_command(struct iscsi_conn     *conn,
        else
                data_buf = &iser_ctask->data[ISER_DIR_OUT];

-       if (sc->use_sg) { /* using a scatter list */
-               data_buf->buf  = sc->request_buffer;
-               data_buf->size = sc->use_sg;
-       } else if (sc->request_bufflen) {
-               /* using a single buffer - convert it into one entry SG */
-               sg_init_one(&data_buf->sg_single,
-                           sc->request_buffer, sc->request_bufflen);
-               data_buf->buf   = &data_buf->sg_single;
-               data_buf->size  = 1;
+       if (scsi_sg_count(sc)) { /* using a scatter list */
+               data_buf->buf  = scsi_sglist(sc);
+               data_buf->size = scsi_sg_count(sc);
        }

-       data_buf->data_len = sc->request_bufflen;
+       data_buf->data_len = scsi_bufflen(sc);

        if (hdr->flags & ISCSI_FLAG_CMD_READ) {
                err = iser_prepare_read_cmd(ctask, edtl);
--
1.4.4.4


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google
Groups "open-iscsi" group.
To post to this group, send email to open-iscsi at googlegroups.com
To unsubscribe from this group, send email to
open-iscsi-unsubscribe at googlegroups.com
For more options, visit this group at
http://groups.google.com/group/open-iscsi
-~----------~----~----~----~------~----~------~--~---