From 9bf194c23f35712b02b9b7b367aba2b6161eebaf Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Wed, 6 Mar 2019 15:43:04 +0100 Subject: [PATCH] iscsi_direct: Don't overwrite error in virStorageBackenISCSIDirectWipeVol() If virStorageBackendISCSIDirectVolWipeZero() fails, it has already reported an error which is probably specific enough. Do not overwrite it with some generic one. Signed-off-by: Michal Privoznik Reviewed-by: Pavel Hrdina --- src/storage/storage_backend_iscsi_direct.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index fc3b6550f7..fc161e6833 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -679,12 +679,8 @@ virStorageBackenISCSIDirectWipeVol(virStoragePoolObjPtr pool, switch ((virStorageVolWipeAlgorithm) algorithm) { case VIR_STORAGE_VOL_WIPE_ALG_ZERO: - if (virStorageBackendISCSIDirectVolWipeZero(vol, iscsi) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to wipe volume %s"), - vol->name); + if (virStorageBackendISCSIDirectVolWipeZero(vol, iscsi) < 0) goto cleanup; - } break; case VIR_STORAGE_VOL_WIPE_ALG_TRIM: case VIR_STORAGE_VOL_WIPE_ALG_NNSA: -- 2.47.2