From a8fcd1885084e87a77ef81e6ccef90b037021544 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 17 Dec 2020 13:52:45 -0800 Subject: [PATCH] Revert "specify number of blocks in write_same command" As reported by Sitsofe Wheeler, the WRITE SAME commands with zero blocks are only issued if WSNZ == 0. WSNZ == 0 means that zero in the NUMBER OF LOGICAL BLOCKS field means that all logical blocks until the end are affected. In other words, the original code was fine. Hence revert commit dfff7e9d16bb. Reported-by: Sitsofe Wheeler --- test-tool/test_writesame10_unmap_until_end.c | 4 +--- test-tool/test_writesame16_unmap_until_end.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/test-tool/test_writesame10_unmap_until_end.c b/test-tool/test_writesame10_unmap_until_end.c index 2476905..0210961 100644 --- a/test-tool/test_writesame10_unmap_until_end.c +++ b/test-tool/test_writesame10_unmap_until_end.c @@ -53,11 +53,9 @@ test_writesame10_unmap_until_end(void) i * block_size, block_size, 0, 0, 0, 0, 0, scratch, EXPECT_STATUS_GOOD); - // write 0-buffer to entire range. - memset(scratch, 0, block_size * i); logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME10", i); WRITESAME10(sd, num_blocks - i, - block_size, i, 0, 1, 0, 0, scratch, + block_size, 0, 0, 1, 0, 0, scratch, EXPECT_STATUS_GOOD); if (rc16->lbprz) { diff --git a/test-tool/test_writesame16_unmap_until_end.c b/test-tool/test_writesame16_unmap_until_end.c index 2bf2ec6..6b18c1f 100644 --- a/test-tool/test_writesame16_unmap_until_end.c +++ b/test-tool/test_writesame16_unmap_until_end.c @@ -58,7 +58,7 @@ test_writesame16_unmap_until_end(void) logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME16", i); memset(scratch, 0, block_size); WRITESAME16(sd, num_blocks - i, - block_size, i, 0, 1, 0, 0, scratch, + block_size, 0, 0, 1, 0, 0, scratch, EXPECT_STATUS_GOOD); if (rc16->lbprz) {