From: Nicholas Bellinger <nab@linux-iscsi.org>
Date: Tue, 10 Jun 2014 08:19:38 +0000 (-0700)
Subject: vhost-scsi: Include prot_bytes into expected data transfer length
X-Git-Tag: MMI-PSA29.97-13-9~12062^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9f977ef7b671f6169eca78bf40f230fe84b7c7e5;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

vhost-scsi: Include prot_bytes into expected data transfer length

This patch updates vhost_scsi_get_tag() to accept the combined
expected data transfer length + T10 PI bytes as the value passed
into target_submit_cmd().

This is required now that target-core logic in commit 14ef9200
expects to subtract se_cmd->prot_length from se_cmd->data_length.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
---

diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index 667e72d46998..03e484fa1ef4 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -1144,7 +1144,8 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq)
 		}
 
 		cmd = vhost_scsi_get_tag(vq, tpg, cdb, tag, lun, task_attr,
-					 exp_data_len, data_direction);
+					 exp_data_len + prot_bytes,
+					 data_direction);
 		if (IS_ERR(cmd)) {
 			vq_err(vq, "vhost_scsi_get_tag failed %ld\n",
 					PTR_ERR(cmd));