From: John Ferlan <jferlan@redhat.com>
Date: Thu, 24 Aug 2017 22:19:14 +0000 (-0400)
Subject: storage: Use virStorageBackendRefreshVolTargetUpdate after wipeVol
X-Git-Tag: v3.7.0-rc2^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d16f803d780f63b8899df04b624d5acfd6939541;p=thirdparty%2Flibvirt.git

storage: Use virStorageBackendRefreshVolTargetUpdate after wipeVol

https://bugzilla.redhat.com/show_bug.cgi?id=1437797

Rather than using refreshVol which essentially only updates the
allocation, capacity, and permissions for the volume, but not
the format which does get updated in a pool refresh - let's use
the same helper that pool refresh uses in order to update the
volume target.
---

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 855212063b..7cf5943cb6 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -2496,8 +2496,11 @@ storageVolWipePattern(virStorageVolPtr vol,
     if (backend->wipeVol(vol->conn, obj, voldef, algorithm, flags) < 0)
         goto cleanup;
 
-    if (backend->refreshVol &&
-        backend->refreshVol(vol->conn, obj, voldef) < 0)
+    /* Instead of using the refreshVol, since much changes on the target
+     * volume, let's update using the same function as refreshPool would
+     * use when it discovers a volume. The only failure to capture is -1,
+     * we can ignore -2. */
+    if (virStorageBackendRefreshVolTargetUpdate(voldef) == -1)
         goto cleanup;
 
     ret = 0;