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

Update the MTX patch for libiscsi.

Browse Source 
MTX sets XFER-direction to "WRITE" even if the xfer length is 0
Catch this condition so that we pass XFER-direction==NONE to libiscsi for this case
This commit is contained in:
Ronnie Sahlberg
2012-08-09 20:46:54 +10:00
parent 08034c3335
commit 185649144d
1 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
patches/mtx-iscsi.diff
View File

@@ -1,3 +1,14 @@
commit 2b859765244332e95fe960e7ec94b744e02c7c83
Author: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Thu Aug 9 20:44:45 2012 +1000
ISCSI support
Add support for specifying devices using '-f iscsi://<host>/<target>/<lun>
syntax
Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
diff --git a/Makefile.in b/Makefile.in diff --git a/Makefile.in b/Makefile.in
index 6b967cf..fe81280 100644 index 6b967cf..fe81280 100644
--- a/Makefile.in --- a/Makefile.in
@@ -96,10 +107,10 @@ index 073f4fa..84510cc 100644
#undef min #undef min
diff --git a/scsi_linux.c b/scsi_linux.c diff --git a/scsi_linux.c b/scsi_linux.c
index cc14ebf..099cdb4 100644 index cc14ebf..8a7becb 100644
--- a/scsi_linux.c --- a/scsi_linux.c
+++ b/scsi_linux.c +++ b/scsi_linux.c
@@ -58,14 +58,128 @@ $Revision: 193 $ @@ -58,14 +58,133 @@ $Revision: 193 $
static int pack_id; static int pack_id;
static int sg_timeout; static int sg_timeout;
@@ -134,18 +145,23 @@ index cc14ebf..099cdb4 100644
+ task->cdb_size = CDB_Length; + task->cdb_size = CDB_Length;
+ memcpy(&task->cdb[0], CDB, task->cdb_size); + memcpy(&task->cdb[0], CDB, task->cdb_size);
+ +
+ switch (Direction) { + if (DataBufferLength > 0) {
+ case Input: + switch (Direction) {
+ task->xfer_dir = SCSI_XFER_READ; + case Input:
+ task->expxferlen = DataBufferLength; + task->xfer_dir = SCSI_XFER_READ;
+ break; + task->expxferlen = DataBufferLength;
+ case Output: + break;
+ task->xfer_dir = SCSI_XFER_WRITE; + case Output:
+ task->expxferlen = DataBufferLength; + task->xfer_dir = SCSI_XFER_WRITE;
+ outdata.size = DataBufferLength; + task->expxferlen = DataBufferLength;
+ outdata.data = DataBuffer; + outdata.size = DataBufferLength;
+ data = &outdata; + outdata.data = DataBuffer;
+ break; + data = &outdata;
+ break;
+ }
+ } else {
+ task->xfer_dir = SCSI_XFER_NONE;
+ task->expxferlen = 0;
+ } + }
+ +
+ if (iscsi_scsi_command_sync(iscsi_lun.context, iscsi_lun.lun, task, data) == NULL) { + if (iscsi_scsi_command_sync(iscsi_lun.context, iscsi_lun.lun, task, data) == NULL) {
@@ -229,7 +245,7 @@ index cc14ebf..099cdb4 100644
if (DeviceFD < 0) if (DeviceFD < 0)
FatalError("cannot open SCSI device '%s' - %m\n", DeviceName); FatalError("cannot open SCSI device '%s' - %m\n", DeviceName);
@@ -98,6 +212,14 @@ void SCSI_Default_Timeout(void) @@ -98,6 +217,14 @@ void SCSI_Default_Timeout(void)
void SCSI_CloseDevice(char *DeviceName, DEVICE_TYPE DeviceFD) void SCSI_CloseDevice(char *DeviceName, DEVICE_TYPE DeviceFD)
{ {
@@ -244,7 +260,7 @@ index cc14ebf..099cdb4 100644
if (close(DeviceFD) < 0) if (close(DeviceFD) < 0)
FatalError("cannot close SCSI device '%s' - %m\n", DeviceName); FatalError("cannot close SCSI device '%s' - %m\n", DeviceName);
} }
@@ -118,6 +240,16 @@ scsi_id_t *SCSI_GetIDLun(DEVICE_TYPE fd) @@ -118,6 +245,16 @@ scsi_id_t *SCSI_GetIDLun(DEVICE_TYPE fd)
int word2; int word2;
} idlun; } idlun;
@@ -261,7 +277,7 @@ index cc14ebf..099cdb4 100644
status = ioctl(fd, SCSI_IOCTL_GET_IDLUN, &idlun); status = ioctl(fd, SCSI_IOCTL_GET_IDLUN, &idlun);
if (status) if (status)
{ {
@@ -157,6 +289,13 @@ int SCSI_ExecuteCommand(DEVICE_TYPE DeviceFD, @@ -157,6 +294,13 @@ int SCSI_ExecuteCommand(DEVICE_TYPE DeviceFD,
unsigned int status; unsigned int status;
sg_io_hdr_t io_hdr; sg_io_hdr_t io_hdr;
@@ -275,7 +291,7 @@ index cc14ebf..099cdb4 100644
memset(&io_hdr, 0, sizeof(sg_io_hdr_t)); memset(&io_hdr, 0, sizeof(sg_io_hdr_t));
memset(RequestSense, 0, sizeof(RequestSense_T)); memset(RequestSense, 0, sizeof(RequestSense_T));
@@ -261,6 +400,13 @@ int SCSI_ExecuteCommand(DEVICE_TYPE DeviceFD, @@ -261,6 +405,13 @@ int SCSI_ExecuteCommand(DEVICE_TYPE DeviceFD,
struct sg_header *Header; /* we actually point this into Command... */ struct sg_header *Header; /* we actually point this into Command... */
struct sg_header *ResultHeader; /* we point this into ResultBuf... */ struct sg_header *ResultHeader; /* we point this into ResultBuf... */