From: John Ferlan <jferlan@redhat.com>
Date: Wed, 2 Dec 2015 21:38:50 +0000 (-0500)
Subject: storage: Add virCheckFlags to virStorageBackendRBDDeleteVol
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=be783825af73202cad0242aad7671e98b726f4ce;p=libvirt.git

storage: Add virCheckFlags to virStorageBackendRBDDeleteVol

The initial commit '74951eade' did not include the proper check for whether
any flags are supported by the driver.

Even though the driver doesn't support VIR_STORAGE_VOL_DELETE_ZEROED,
it still checks and allows the processing to continue

Also add the new VIR_STORAGE_VOL_DELETE_WITH_SNAPSHOTS since it is handled
as of commit id '3c7590e0a'.
---

diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index b66fcbe9cd..cdbfdee985 100644
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -513,6 +513,9 @@ static int virStorageBackendRBDDeleteVol(virConnectPtr conn,
     ptr.cluster = NULL;
     ptr.ioctx = NULL;
 
+    virCheckFlags(VIR_STORAGE_VOL_DELETE_ZEROED |
+                  VIR_STORAGE_VOL_DELETE_WITH_SNAPSHOTS, -1);
+
     VIR_DEBUG("Removing RBD image %s/%s", pool->def->source.name, vol->name);
 
     if (flags & VIR_STORAGE_VOL_DELETE_ZEROED)