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

test_writesame_unmap_until_end: fix unsupported fallback

Browse Source 
2e947cc1de added logic to check that
targets missing zero block writesame support return INVALID_FIELD_IN_CDB
to such requests. However, this change incorrectly set the writesame
number_of_logical_blocks field to one.

Signed-off-by: David Disseldorp <ddiss@suse.de>
This commit is contained in:
David Disseldorp
2017-12-20 16:14:56 +01:00
parent aa617d1e5e
commit dc0c3c76c0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test-tool/test_writesame10_unmap_until_end.c
View File

@@ -39,8 +39,8 @@ test_writesame10_unmap_until_end(void)
if (inq_bl->wsnz) { if (inq_bl->wsnz) {
logging(LOG_NORMAL, "WRITESAME10 does not support 0-blocks." logging(LOG_NORMAL, "WRITESAME10 does not support 0-blocks."
"WSNZ == 1"); "WSNZ == 1");
WRITESAME10(sd, 0, memset(scratch, 0, block_size);
0, 1, 0, 1, 0, 0, scratch, WRITESAME10(sd, 0, block_size, 0, 0, 1, 0, 0, scratch,
EXPECT_INVALID_FIELD_IN_CDB); EXPECT_INVALID_FIELD_IN_CDB);
return; return;
} }

6
test-tool/test_writesame16_unmap_until_end.c
View File

@@ -40,8 +40,8 @@ test_writesame16_unmap_until_end(void)
if (inq_bl->wsnz) { if (inq_bl->wsnz) {
logging(LOG_NORMAL, "WRITESAME16 does not support 0-blocks." logging(LOG_NORMAL, "WRITESAME16 does not support 0-blocks."
"WSNZ == 1"); "WSNZ == 1");
WRITESAME16(sd, 0, memset(scratch, 0, block_size);
0, 1, 0, 1, 0, 0, scratch, WRITESAME16(sd, 0, block_size, 0, 0, 1, 0, 0, scratch,
EXPECT_INVALID_FIELD_IN_CDB); EXPECT_INVALID_FIELD_IN_CDB);
return; return;
} }
@@ -55,7 +55,7 @@ test_writesame16_unmap_until_end(void)
WRITE16(sd, num_blocks - i, WRITE16(sd, num_blocks - i,
i * block_size, block_size, 0, 0, 0, 0, 0, scratch, i * block_size, block_size, 0, 0, 0, 0, 0, scratch,
EXPECT_STATUS_GOOD); EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME16", i); logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME16", i);
memset(scratch, 0, block_size); memset(scratch, 0, block_size);
WRITESAME16(sd, num_blocks - i, WRITESAME16(sd, num_blocks - i,