admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

iscsi-test-cu: set up vectored transfer length properly

Browse Source 
I didn't set up the transfer length properly for the vectored SG_IO
support in the previous patch, which makes some implementations
of the ioctl unhappy.  Fix this up per the spec.
This commit is contained in:
Christoph Hellwig
2015-04-18 21:05:19 +02:00
committed by Ronnie Sahlberg
parent b745e28573
commit 60a0289d74
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test-tool/iscsi-support.c
View File

@@ -212,6 +212,16 @@ static int check_result(const char *opcode, struct scsi_device *sdev,
return 0; return 0;
} }
static size_t iov_tot_len(struct scsi_iovec *iov, int niov)
{
size_t len = 0;
int i;
for (i = 0; i < niov; i++)
len += iov[i].iov_len;
return len;
}
static struct scsi_task *send_scsi_command(struct scsi_device *sdev, struct scsi_task *task, struct iscsi_data *d) static struct scsi_task *send_scsi_command(struct scsi_device *sdev, struct scsi_task *task, struct iscsi_data *d)
{ {
if (sdev->iscsi_url) { if (sdev->iscsi_url) {
@@ -266,8 +276,10 @@ static struct scsi_task *send_scsi_command(struct scsi_device *sdev, struct scsi
switch (task->xfer_dir) { switch (task->xfer_dir) {
case SCSI_XFER_WRITE: case SCSI_XFER_WRITE:
io_hdr.dxfer_direction = SG_DXFER_TO_DEV; io_hdr.dxfer_direction = SG_DXFER_TO_DEV;
io_hdr.iovec_count = task->iovector_out.niov;
io_hdr.dxferp = task->iovector_out.iov; io_hdr.dxferp = task->iovector_out.iov;
io_hdr.dxfer_len = task->iovector_out.niov; io_hdr.dxfer_len = iov_tot_len(task->iovector_out.iov,
task->iovector_out.niov);
break; break;
case SCSI_XFER_READ: case SCSI_XFER_READ:
io_hdr.dxfer_direction = SG_DXFER_FROM_DEV; io_hdr.dxfer_direction = SG_DXFER_FROM_DEV;