]> xenbits.xensource.com Git - libvirt.git/commitdiff
iscsi_direct: Don't overwrite error in virStorageBackenISCSIDirectWipeVol()
authorMichal Privoznik <mprivozn@redhat.com>
Wed, 6 Mar 2019 14:43:04 +0000 (15:43 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Sat, 16 Mar 2019 06:50:51 +0000 (07:50 +0100)
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>
src/storage/storage_backend_iscsi_direct.c

index fc3b6550f741782cb701700c2d39fc056faf11ff..fc161e6833cd6395261a5ab5a87622129628455f 100644 (file)
@@ -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: