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

TEST: Add test for ORWRITE command

Browse Source
This commit is contained in:
Ronnie Sahlberg
2012-07-14 17:29:58 +10:00
parent 11f7da678b
commit 1ce5d97e57
11 changed files with 291 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libiscsi.def
View File

@@ -88,8 +88,8 @@ iscsi_write12_sync
iscsi_write12_task
iscsi_write16_sync
iscsi_write16_task
iscsi_orwrite16_sync
iscsi_orwrite16_task
iscsi_orwrite_sync
iscsi_orwrite_task
iscsi_compareandwrite_sync
iscsi_compareandwrite_task
iscsi_writeverify10_sync
@@ -124,7 +124,7 @@ scsi_cdb_verify16
scsi_cdb_write10
scsi_cdb_write12
scsi_cdb_write16
scsi_cdb_orwrite16
scsi_cdb_orwrite
scsi_cdb_writeverify10
scsi_cdb_writeverify12
scsi_cdb_writeverify16

6
lib/libiscsi.syms
View File

@@ -86,8 +86,8 @@ iscsi_write12_sync
iscsi_write12_task
iscsi_write16_sync
iscsi_write16_task
iscsi_orwrite16_sync
iscsi_orwrite16_task
iscsi_orwrite_sync
iscsi_orwrite_task
iscsi_compareandwrite_sync
iscsi_compareandwrite_task
iscsi_writeverify10_sync
@@ -122,7 +122,7 @@ scsi_cdb_verify16
scsi_cdb_write10
scsi_cdb_write12
scsi_cdb_write16
scsi_cdb_orwrite16
scsi_cdb_orwrite
scsi_cdb_writeverify10
scsi_cdb_writeverify12
scsi_cdb_writeverify16

6
lib/scsi-command.c
View File

@@ -871,7 +871,7 @@ iscsi_write16_task(struct iscsi_context *iscsi, int lun, uint64_t lba,
}
struct scsi_task *
iscsi_orwrite16_task(struct iscsi_context *iscsi, int lun, uint64_t lba,
iscsi_orwrite_task(struct iscsi_context *iscsi, int lun, uint64_t lba,
unsigned char *data, uint32_t datalen, int blocksize,
int wrprotect, int dpo, int fua, int fua_nv, int group_number,
iscsi_command_cb cb, void *private_data)
@@ -885,11 +885,11 @@ iscsi_orwrite16_task(struct iscsi_context *iscsi, int lun, uint64_t lba,
return NULL;
}
task = scsi_cdb_orwrite16(lba, datalen, blocksize, wrprotect,
task = scsi_cdb_orwrite(lba, datalen, blocksize, wrprotect,
dpo, fua, fua_nv, group_number);
if (task == NULL) {
iscsi_set_error(iscsi, "Out-of-memory: Failed to create "
"orwrite16 cdb.");
"orwrite cdb.");
return NULL;
}

10
lib/scsi-lowlevel.c
View File

@@ -984,10 +984,10 @@ scsi_cdb_write16(uint64_t lba, uint32_t xferlen, int blocksize, int wrprotect, i
}
/*
* ORWRITE16
* ORWRITE
*/
struct scsi_task *
scsi_cdb_orwrite16(uint64_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number)
scsi_cdb_orwrite(uint64_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number)
{
struct scsi_task *task;
@@ -997,7 +997,7 @@ scsi_cdb_orwrite16(uint64_t lba, uint32_t xferlen, int blocksize, int wrprotect,
}
memset(task, 0, sizeof(struct scsi_task));
task->cdb[0] = SCSI_OPCODE_ORWRITE16;
task->cdb[0] = SCSI_OPCODE_ORWRITE;
task->cdb[1] |= ((wrprotect & 0x07) << 5);
if (dpo) {
@@ -1024,8 +1024,8 @@ scsi_cdb_orwrite16(uint64_t lba, uint32_t xferlen, int blocksize, int wrprotect,
}
task->expxferlen = xferlen;
task->params.orwrite16.lba = lba;
task->params.orwrite16.num_blocks = xferlen/blocksize;
task->params.orwrite.lba = lba;
task->params.orwrite.num_blocks = xferlen/blocksize;
return task;
}

6
lib/sync.c
View File

@@ -529,7 +529,7 @@ iscsi_write16_sync(struct iscsi_context *iscsi, int lun, uint64_t lba,
}
struct scsi_task *
iscsi_orwrite16_sync(struct iscsi_context *iscsi, int lun, uint64_t lba,
iscsi_orwrite_sync(struct iscsi_context *iscsi, int lun, uint64_t lba,
unsigned char *data, uint32_t datalen, int blocksize,
int wrprotect, int dpo, int fua, int fua_nv, int group_number)
{
@@ -537,12 +537,12 @@ iscsi_orwrite16_sync(struct iscsi_context *iscsi, int lun, uint64_t lba,
memset(&state, 0, sizeof(state));
if (iscsi_orwrite16_task(iscsi, lun, lba,
if (iscsi_orwrite_task(iscsi, lun, lba,
data, datalen, blocksize, wrprotect,
dpo, fua, fua_nv, group_number,
scsi_sync_cb, &state) == NULL) {
iscsi_set_error(iscsi,
"Failed to send Orwrite16 command");
"Failed to send Orwrite command");
return NULL;
}