External/libvirt
1
0
Fork 0
Code

storage: Clean up unlocking of storage pool objects

Browse Source 
Most of the APIs now don't reach the cleanup section when the pool
object wasn't found and thus don't need to check before unlocking it.
This commit is contained in:
Peter Krempa 2014-06-12 09:55:17 +02:00
parent efd892761e
commit 30d99eb534
1 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/storage/storage_driver.c
View File

@ -289,7 +289,6 @@ storagePoolLookupByUUID(virConnectPtr conn,
NULL, NULL); NULL, NULL);
cleanup: cleanup:
if (pool)
virStoragePoolObjUnlock(pool); virStoragePoolObjUnlock(pool);
return ret; return ret;
} }
@ -309,7 +308,7 @@ storagePoolLookupByName(virConnectPtr conn,
if (!pool) { if (!pool) {
virReportError(VIR_ERR_NO_STORAGE_POOL, virReportError(VIR_ERR_NO_STORAGE_POOL,
_("no storage pool with matching name '%s'"), name); _("no storage pool with matching name '%s'"), name);
goto cleanup; return NULL;
} }
if (virStoragePoolLookupByNameEnsureACL(conn, pool->def) < 0) if (virStoragePoolLookupByNameEnsureACL(conn, pool->def) < 0)
@ -319,7 +318,6 @@ storagePoolLookupByName(virConnectPtr conn,
NULL, NULL); NULL, NULL);
cleanup: cleanup:
if (pool)
virStoragePoolObjUnlock(pool); virStoragePoolObjUnlock(pool);
return ret; return ret;
} }
@ -338,7 +336,7 @@ storagePoolLookupByVolume(virStorageVolPtr vol)
if (!pool) { if (!pool) {
virReportError(VIR_ERR_NO_STORAGE_POOL, virReportError(VIR_ERR_NO_STORAGE_POOL,
_("no storage pool with matching name '%s'"), vol->pool); _("no storage pool with matching name '%s'"), vol->pool);
goto cleanup; return NULL;
} }
if (virStoragePoolLookupByVolumeEnsureACL(vol->conn, pool->def) < 0) if (virStoragePoolLookupByVolumeEnsureACL(vol->conn, pool->def) < 0)
@ -348,7 +346,6 @@ storagePoolLookupByVolume(virStorageVolPtr vol)
NULL, NULL); NULL, NULL);
cleanup: cleanup:
if (pool)
virStoragePoolObjUnlock(pool); virStoragePoolObjUnlock(pool);
return ret; return ret;
} }
@ -571,7 +568,6 @@ static int storagePoolIsActive(virStoragePoolPtr pool)
ret = virStoragePoolObjIsActive(obj); ret = virStoragePoolObjIsActive(obj);
cleanup: cleanup:
if (obj)
virStoragePoolObjUnlock(obj); virStoragePoolObjUnlock(obj);
return ret; return ret;
} }
@ -590,7 +586,6 @@ static int storagePoolIsPersistent(virStoragePoolPtr pool)
ret = obj->configFile ? 1 : 0; ret = obj->configFile ? 1 : 0;
cleanup: cleanup:
if (obj)
virStoragePoolObjUnlock(obj); virStoragePoolObjUnlock(obj);
return ret; return ret;
} }
@ -805,7 +800,6 @@ storagePoolCreate(virStoragePoolPtr obj,
ret = 0; ret = 0;
cleanup: cleanup:
if (pool)
virStoragePoolObjUnlock(pool); virStoragePoolObjUnlock(pool);
return ret; return ret;
} }
@ -840,7 +834,6 @@ storagePoolBuild(virStoragePoolPtr obj,
ret = 0; ret = 0;
cleanup: cleanup:
if (pool)
virStoragePoolObjUnlock(pool); virStoragePoolObjUnlock(pool);
return ret; return ret;
} }
@ -951,7 +944,6 @@ storagePoolDelete(virStoragePoolPtr obj,
ret = 0; ret = 0;
cleanup: cleanup:
if (pool)
virStoragePoolObjUnlock(pool); virStoragePoolObjUnlock(pool);
return ret; return ret;
} }
@ -1047,7 +1039,6 @@ storagePoolGetInfo(virStoragePoolPtr obj,
ret = 0; ret = 0;
cleanup: cleanup:
if (pool)
virStoragePoolObjUnlock(pool); virStoragePoolObjUnlock(pool);
return ret; return ret;
} }
@ -1076,7 +1067,6 @@ storagePoolGetXMLDesc(virStoragePoolPtr obj,
ret = virStoragePoolDefFormat(def); ret = virStoragePoolDefFormat(def);
cleanup: cleanup:
if (pool)
virStoragePoolObjUnlock(pool); virStoragePoolObjUnlock(pool);
return ret; return ret;
} }
@ -1102,7 +1092,6 @@ storagePoolGetAutostart(virStoragePoolPtr obj,
ret = 0; ret = 0;
cleanup: cleanup:
if (pool)
virStoragePoolObjUnlock(pool); virStoragePoolObjUnlock(pool);
return ret; return ret;
} }
@ -1200,7 +1189,6 @@ storagePoolNumOfVolumes(virStoragePoolPtr obj)
} }
cleanup: cleanup:
if (pool)
virStoragePoolObjUnlock(pool); virStoragePoolObjUnlock(pool);
return ret; return ret;
} }
@ -1240,7 +1228,6 @@ storagePoolListVolumes(virStoragePoolPtr obj,
return n; return n;
cleanup: cleanup:
if (pool)
virStoragePoolObjUnlock(pool); virStoragePoolObjUnlock(pool);
for (n = 0; n < maxnames; n++) for (n = 0; n < maxnames; n++)
VIR_FREE(names[n]); VIR_FREE(names[n]);
@ -1309,7 +1296,6 @@ storagePoolListAllVolumes(virStoragePoolPtr pool,
VIR_FREE(tmp_vols); VIR_FREE(tmp_vols);
} }
if (obj)
virStoragePoolObjUnlock(obj); virStoragePoolObjUnlock(obj);
return ret; return ret;
@ -1348,7 +1334,6 @@ storageVolLookupByName(virStoragePoolPtr obj,
NULL, NULL); NULL, NULL);
cleanup: cleanup:
if (pool)
virStoragePoolObjUnlock(pool); virStoragePoolObjUnlock(pool);
return ret; return ret;
} }