aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/vhost
diff options
context:
space:
mode:
authorNicholas Bellinger <nab@linux-iscsi.org>2014-06-10 04:19:38 -0400
committerNicholas Bellinger <nab@linux-iscsi.org>2014-06-11 16:06:50 -0400
commit9f977ef7b671f6169eca78bf40f230fe84b7c7e5 (patch)
tree88845561247d1f3f429d97e2800b347eb91ed261 /drivers/vhost
parente2a4f55c6498b59a17a85a1bb6db122a993ffe02 (diff)
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>
Diffstat (limited to 'drivers/vhost')
-rw-r--r--drivers/vhost/scsi.c3
1 files changed, 2 insertions, 1 deletions
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)
1144 } 1144 }
1145 1145
1146 cmd = vhost_scsi_get_tag(vq, tpg, cdb, tag, lun, task_attr, 1146 cmd = vhost_scsi_get_tag(vq, tpg, cdb, tag, lun, task_attr,
1147 exp_data_len, data_direction); 1147 exp_data_len + prot_bytes,
1148 data_direction);
1148 if (IS_ERR(cmd)) { 1149 if (IS_ERR(cmd)) {
1149 vq_err(vq, "vhost_scsi_get_tag failed %ld\n", 1150 vq_err(vq, "vhost_scsi_get_tag failed %ld\n",
1150 PTR_ERR(cmd)); 1151 PTR_ERR(cmd));