SCSI: remove LBDATA/PBDATA from the WriteSame10/16 signatures

Make LBA the third argument to the iscsi writesame functions
This commit is contained in:
Ronnie Sahlberg
2013-01-21 21:15:37 -08:00
parent 9bf6a3d68b
commit 0f73f062d2
18 changed files with 170 additions and 129 deletions

View File

@@ -118,9 +118,10 @@ int T0190_writesame16_unmap(const char *initiator, const char *url)
if (lbpws == 1 && i % lbppb) {
continue;
}
task = iscsi_writesame16_sync(iscsi, lun, NULL, 0,
0, i,
0, 1, 0, 0, 0, 0);
task = iscsi_writesame16_sync(iscsi, lun, 0,
NULL, 0,
i,
0, 1, 0, 0);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send WRITESAME16 command: %s\n", iscsi_get_error(iscsi));
@@ -173,9 +174,10 @@ int T0190_writesame16_unmap(const char *initiator, const char *url)
continue;
}
task = iscsi_writesame16_sync(iscsi, lun, NULL, 0,
num_blocks + 1 - i, i,
0, 1, 0, 0, 0, 0);
task = iscsi_writesame16_sync(iscsi, lun, num_blocks + 1 - i,
NULL, 0,
i,
0, 1, 0, 0);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send WRITESAME16 command: %s\n", iscsi_get_error(iscsi));
@@ -208,9 +210,10 @@ int T0190_writesame16_unmap(const char *initiator, const char *url)
/* Test that UNMAP=0 and ANCHOR==1 fails with check condition */
printf("Try UNMAP==0 and ANCHOR==1 ... ");
task = iscsi_writesame16_sync(iscsi, lun, NULL, 0,
0, 64,
1, 0, 0, 0, 0, 0);
task = iscsi_writesame16_sync(iscsi, lun, 0,
NULL, 0,
64,
1, 0, 0, 0);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send WRITESAME16 command: %s\n", iscsi_get_error(iscsi));
@@ -235,9 +238,10 @@ int T0190_writesame16_unmap(const char *initiator, const char *url)
if (anc_sup == 0) {
printf("(ANC_SUP==0 so check condition expected) ");
}
task = iscsi_writesame16_sync(iscsi, lun, NULL, 0,
0, 64,
1, 1, 0, 0, 0, 0);
task = iscsi_writesame16_sync(iscsi, lun, 0,
NULL, 0,
64,
1, 1, 0, 0);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send WRITESAME16 command: %s\n", iscsi_get_error(iscsi));