]> xenbits.xensource.com Git - libvirt.git/commitdiff
storage: Remove redundant refreshPool check
authorCole Robinson <crobinso@redhat.com>
Thu, 23 Jun 2016 00:28:09 +0000 (20:28 -0400)
committerCole Robinson <crobinso@redhat.com>
Thu, 23 Jun 2016 13:29:54 +0000 (09:29 -0400)
Every driver provides a refreshPool impl, and many other critical
places in the code unconditionally call it without checking if
it exists, so this check is pointless

src/storage/storage_driver.c

index e2d729f06db282115b3b29d413405eb7f2249a9e..4b5419d43ba084fa61c467adb0c9423a0a2a5762 100644 (file)
@@ -2422,20 +2422,18 @@ storageVolUpload(virStorageVolPtr obj,
         goto cleanup;
     }
 
-    /* If we have a refreshPool, use the callback routine in order to
+    /* Use the callback routine in order to
      * refresh the pool after the volume upload stream closes. This way
      * we make sure the volume and pool data are refreshed without user
      * interaction and we can just lookup the backend in the callback
      * routine in order to call the refresh API.
      */
-    if (backend->refreshPool) {
-        if (VIR_ALLOC(cbdata) < 0 ||
-            VIR_STRDUP(cbdata->pool_name, pool->def->name) < 0)
-            goto cleanup;
-        if (vol->target.type == VIR_STORAGE_VOL_PLOOP &&
-            VIR_STRDUP(cbdata->vol_path, vol->target.path) < 0)
-            goto cleanup;
-    }
+    if (VIR_ALLOC(cbdata) < 0 ||
+        VIR_STRDUP(cbdata->pool_name, pool->def->name) < 0)
+        goto cleanup;
+    if (vol->target.type == VIR_STORAGE_VOL_PLOOP &&
+        VIR_STRDUP(cbdata->vol_path, vol->target.path) < 0)
+        goto cleanup;
 
     if ((ret = backend->uploadVol(obj->conn, pool, vol, stream,
                                   offset, length, flags)) < 0)