From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 6 Mar 2019 14:43:04 +0000 (+0100)
Subject: iscsi_direct: Don't overwrite error in virStorageBackenISCSIDirectWipeVol()
X-Git-Tag: v5.2.0-rc1~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bf194c23f35712b02b9b7b367aba2b6161eebaf;p=thirdparty%2Flibvirt.git

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 <mprivozn@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
---

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: