]> xenbits.xensource.com Git - people/dariof/libvirt.git/commitdiff
Unlock the storage volume object after looking it up
authorJán Tomko <jtomko@redhat.com>
Thu, 4 Jul 2013 12:41:46 +0000 (14:41 +0200)
committerJán Tomko <jtomko@redhat.com>
Thu, 4 Jul 2013 12:41:46 +0000 (14:41 +0200)
Introduced by c930410.

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

src/storage/storage_driver.c

index 02f7b69893c42ccd5a64cb8ae9e94ce2a006864a..d15b3d486824f4e4e48362e8dd8cb20ec7d1c751 100644 (file)
@@ -1380,15 +1380,16 @@ storageVolLookupByKey(virConnectPtr conn,
                 virStorageVolDefFindByKey(driver->pools.objs[i], key);
 
             if (vol) {
-                if (virStorageVolLookupByKeyEnsureACL(conn, driver->pools.objs[i]->def, vol) < 0)
+                if (virStorageVolLookupByKeyEnsureACL(conn, driver->pools.objs[i]->def, vol) < 0) {
+                    virStoragePoolObjUnlock(driver->pools.objs[i]);
                     goto cleanup;
+                }
 
                 ret = virGetStorageVol(conn,
                                        driver->pools.objs[i]->def->name,
                                        vol->name,
                                        vol->key,
                                        NULL, NULL);
-                goto cleanup;
             }
         }
         virStoragePoolObjUnlock(driver->pools.objs[i]);
@@ -1440,15 +1441,16 @@ storageVolLookupByPath(virConnectPtr conn,
             VIR_FREE(stable_path);
 
             if (vol) {
-                if (virStorageVolLookupByPathEnsureACL(conn, driver->pools.objs[i]->def, vol) < 0)
+                if (virStorageVolLookupByPathEnsureACL(conn, driver->pools.objs[i]->def, vol) < 0) {
+                    virStoragePoolObjUnlock(driver->pools.objs[i]);
                     goto cleanup;
+                }
 
                 ret = virGetStorageVol(conn,
                                        driver->pools.objs[i]->def->name,
                                        vol->name,
                                        vol->key,
                                        NULL, NULL);
-                goto cleanup;
             }
         }
         virStoragePoolObjUnlock(driver->pools.objs[i]);