From 074b6d24309f7c699517a4e8463463861972e4e5 Mon Sep 17 00:00:00 2001
From: Piotr Pelplinski <piotr.pelplinski@intel.com>
Date: Wed, 12 Oct 2016 14:22:45 +0200
Subject: [PATCH] spdk: remove iobuf from spdk_scsi_task

This patch removes reduntant field in spdk_scsi_task and
fixes all logic to use iov.iov_base

Signed-off-by: Piotr Pelplinski <piotr.pelplinski@intel.com>
Change-Id: Ie2fa1e2357b6383c118d05aec9206d1c60537d40
---
 include/spdk/scsi.h                    | 1 -
 lib/iscsi/iscsi.c                      | 3 +--
 lib/scsi/scsi_bdev.c                   | 2 +-
 test/lib/scsi/scsi_bdev/scsi_bdev_ut.c | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/include/spdk/scsi.h b/include/spdk/scsi.h
index a6b0cf634..02fc9f727 100644
--- a/include/spdk/scsi.h
+++ b/include/spdk/scsi.h
@@ -129,7 +129,6 @@ struct spdk_scsi_task {
 	void (*free_fn)(struct spdk_scsi_task *);
 
 	uint8_t *cdb;
-	uint8_t *iobuf;
 
 	struct iovec iov;
 	struct iovec *iovs;
diff --git a/lib/iscsi/iscsi.c b/lib/iscsi/iscsi.c
index f8cd8ec64..0137b4043 100644
--- a/lib/iscsi/iscsi.c
+++ b/lib/iscsi/iscsi.c
@@ -2993,9 +2993,8 @@ spdk_iscsi_op_scsi(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu)
 
 		if (pdu->data_segment_len == transfer_len) {
 			/* we are doing small writes with no R2T */
-			task->scsi.iobuf = pdu->data;
 			task->scsi.iov.iov_len = transfer_len;
-			task->scsi.iov.iov_base = task->scsi.iobuf;
+			task->scsi.iov.iov_base = pdu->data;
 			task->scsi.length = transfer_len;
 		}
 	} else {
diff --git a/lib/scsi/scsi_bdev.c b/lib/scsi/scsi_bdev.c
index 2b79ab0b7..1ef5eb5c9 100644
--- a/lib/scsi/scsi_bdev.c
+++ b/lib/scsi/scsi_bdev.c
@@ -1680,7 +1680,7 @@ spdk_bdev_scsi_process_primary(struct spdk_bdev *bdev,
 
 	case SPDK_SPC_MODE_SELECT_6:
 	case SPDK_SPC_MODE_SELECT_10:
-		data = task->iobuf;
+		data = task->iov.iov_base;
 
 		if (cdb[0] == SPDK_SPC_MODE_SELECT_6) {
 			md = 4;
diff --git a/test/lib/scsi/scsi_bdev/scsi_bdev_ut.c b/test/lib/scsi/scsi_bdev/scsi_bdev_ut.c
index 23bb7e665..abe1e6ed6 100644
--- a/test/lib/scsi/scsi_bdev/scsi_bdev_ut.c
+++ b/test/lib/scsi/scsi_bdev/scsi_bdev_ut.c
@@ -190,7 +190,7 @@ mode_select_6_test(void)
 	memset(data, 0, sizeof(data));
 	data[4] = 0x08;
 	data[5] = 0x02;
-	task.iobuf = data;
+	task.iov.iov_base = data;
 
 	rc = spdk_bdev_scsi_execute(&bdev, &task);
 
@@ -223,7 +223,7 @@ mode_select_6_test2(void)
 	lun.dev = &dev;
 	task.lun = &lun;
 
-	task.iobuf = NULL;
+	task.iov.iov_base = NULL;
 
 	rc = spdk_bdev_scsi_execute(&bdev, &task);