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

READ10/WRITE10: Change these functions to sue the same signatures as the other READ/WRITE

Browse Source 
Harmonize the signatures for READ10/WRITE10 to match the ones for READ12/16 and WRITE12/16

This breaks the API/ABI so this forces the next version of the library to bump the major version to 2.0

Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
Ronnie Sahlberg
2012-06-05 19:18:32 +10:00
parent 5ccf2f4d87
commit d5f646099d
13 changed files with 70 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test-tool/0100_read10_simple.c
View File

@@ -75,7 +75,7 @@ int T0100_read10_simple(const char *initiator, const char *url, int data_loss _U
/* read the first 1 - 256 blocks at the start of the LUN */
printf("Reading first 1-256 blocks ... ");
for (i=1; i<=256; i++) {
task = iscsi_read10_sync(iscsi, lun, 0, i * block_size, block_size);
task = iscsi_read10_sync(iscsi, lun, 0, i * block_size, block_size, 0, 0, 0, 0, 0);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send read10 command: %s\n", iscsi_get_error(iscsi));
@@ -97,7 +97,7 @@ int T0100_read10_simple(const char *initiator, const char *url, int data_loss _U
/* read the last 1 - 256 blocks at the end of the LUN */
printf("Reading last 1-256 blocks ... ");
for (i=1; i<=256; i++) {
task = iscsi_read10_sync(iscsi, lun, num_blocks +1 - i, i * block_size, block_size);
task = iscsi_read10_sync(iscsi, lun, num_blocks +1 - i, i * block_size, block_size, 0, 0, 0, 0, 0);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send read10 command: %s\n", iscsi_get_error(iscsi));

4
test-tool/0101_read10_beyond_eol.c
View File

@@ -75,7 +75,7 @@ int T0101_read10_beyond_eol(const char *initiator, const char *url, int data_los
/* read 1-256 blocks, one block beyond the end-of-lun */
printf("Reading last 1-256 blocks one block beyond eol ... ");
for (i=1; i<=256; i++) {
task = iscsi_read10_sync(iscsi, lun, num_blocks + 2 - i, i * block_size, block_size);
task = iscsi_read10_sync(iscsi, lun, num_blocks + 2 - i, i * block_size, block_size, 0, 0, 0, 0, 0);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send read10 command: %s\n", iscsi_get_error(iscsi));
@@ -106,7 +106,7 @@ int T0101_read10_beyond_eol(const char *initiator, const char *url, int data_los
/* read 2-256 blocks, all but one block beyond the eol */
printf("Reading 1-255 blocks beyond eol starting at last block ... ");
for (i=2; i<=256; i++) {
task = iscsi_read10_sync(iscsi, lun, num_blocks, i * block_size, block_size);
task = iscsi_read10_sync(iscsi, lun, num_blocks, i * block_size, block_size, 0, 0, 0, 0, 0);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send read10 command: %s\n", iscsi_get_error(iscsi));

8
test-tool/0102_read10_0blocks.c
View File

@@ -76,7 +76,7 @@ int T0102_read10_0blocks(const char *initiator, const char *url, int data_loss _
/* read10 0 blocks one block at lba 0 */
printf("Reading 0 blocks at lba:0 ... ");
task = iscsi_read10_sync(iscsi, lun, 0, 0, block_size);
task = iscsi_read10_sync(iscsi, lun, 0, 0, block_size, 0, 0, 0, 0, 0);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send read10 command: %s\n", iscsi_get_error(iscsi));
@@ -95,7 +95,7 @@ int T0102_read10_0blocks(const char *initiator, const char *url, int data_loss _
/* read10 0 blocks one block beyond the eol */
printf("Reading 0 blocks at one block beyond end ... ");
task = iscsi_read10_sync(iscsi, lun, num_blocks + 1, 0, block_size);
task = iscsi_read10_sync(iscsi, lun, num_blocks + 1, 0, block_size, 0, 0, 0, 0, 0);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send read10 command: %s\n", iscsi_get_error(iscsi));
@@ -124,7 +124,7 @@ int T0102_read10_0blocks(const char *initiator, const char *url, int data_loss _
/* read10 0 blocks two blocks beyond the eol */
printf("Reading 0 blocks at two blocks beyond end ... ");
task = iscsi_read10_sync(iscsi, lun, num_blocks + 1, 0, block_size);
task = iscsi_read10_sync(iscsi, lun, num_blocks + 1, 0, block_size, 0, 0, 0, 0, 0);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send read10 command: %s\n", iscsi_get_error(iscsi));
@@ -156,7 +156,7 @@ int T0102_read10_0blocks(const char *initiator, const char *url, int data_loss _
goto finished;
}
printf("Reading 0 blocks at lba:-1 ... ");
task = iscsi_read10_sync(iscsi, lun, 0xffffff, 0, block_size);
task = iscsi_read10_sync(iscsi, lun, 0xffffff, 0, block_size, 0, 0, 0, 0, 0);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send read10 command: %s\n", iscsi_get_error(iscsi));

2
test-tool/0130_verify10_simple.c
View File

@@ -77,7 +77,7 @@ int T0130_verify10_simple(const char *initiator, const char *url, int data_loss
for (i = 1; i <= 256; i++) {
unsigned char *buf;
task = iscsi_read10_sync(iscsi, lun, 0, i * block_size, block_size);
task = iscsi_read10_sync(iscsi, lun, 0, i * block_size, block_size, 0, 0, 0, 0, 0);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send read10 command: %s\n", iscsi_get_error(iscsi));

2
test-tool/0131_verify10_mismatch.c
View File

@@ -78,7 +78,7 @@ int T0131_verify10_mismatch(const char *initiator, const char *url, int data_los
for (i = 1; i <= 256; i++) {
unsigned char *buf;
task = iscsi_read10_sync(iscsi, lun, 0, i * block_size, block_size);
task = iscsi_read10_sync(iscsi, lun, 0, i * block_size, block_size, 0, 0, 0, 0, 0);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send read10 command: %s\n", iscsi_get_error(iscsi));

2
test-tool/0132_verify10_mismatch_no_cmp.c
View File

@@ -78,7 +78,7 @@ int T0132_verify10_mismatch_no_cmp(const char *initiator, const char *url, int d
for (i = 1; i <= 256; i++) {
unsigned char *buf;
task = iscsi_read10_sync(iscsi, lun, 0, i * block_size, block_size);
task = iscsi_read10_sync(iscsi, lun, 0, i * block_size, block_size, 0, 0, 0, 0, 0);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send read10 command: %s\n", iscsi_get_error(iscsi));