External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-09 06:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage_backend_iscsi_direct: Simplify vol zeroing

Browse Source 
So far we have two branches: either we zero BLOCK_PER_PACKET
(currently 128) block at once, or if we're close to the last block
then we zero out one block at the time. This is very suboptimal.
We know how many block are there left. Might as well just write
them all at once.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Michal Privoznik 2019-03-01 11:42:20 +01:00
parent 61d1abd5f1
commit f7b9d6f78b
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/storage/storage_backend_iscsi_direct.c
View File

@ -638,21 +638,23 @@ virStorageBackendISCSIDirectVolWipeZero(virStorageVolDefPtr vol,
return ret;
while (lba < nb_block) {
if (nb_block - lba > block_size * BLOCK_PER_PACKET) {
const uint64_t to_write = MIN(nb_block - lba + 1, BLOCK_PER_PACKET);
if (!(task = iscsi_write16_sync(iscsi, lun, lba, data,
block_size * BLOCK_PER_PACKET,
block_size, 0, 0, 0, 0, 0)))
return -1;
task = iscsi_write16_sync(iscsi, lun, lba, data,
block_size * to_write,
block_size, 0, 0, 0, 0, 0);
if (!task ||
task->status != SCSI_STATUS_GOOD) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("failed to write to LUN %d: %s"),
lun, iscsi_get_error(iscsi));
scsi_free_scsi_task(task);
lba += BLOCK_PER_PACKET;
} else {
if (!(task = iscsi_write16_sync(iscsi, lun, lba, data, block_size,
block_size, 0, 0, 0, 0, 0)))
return -1;
scsi_free_scsi_task(task);
lba++;
return -1;
}
scsi_free_scsi_task(task);
lba += to_write;
}
return 0;