NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

storage: Use virStoragePoolObj{Get|Incr|Decr}Asyncjobs

Browse Source 
Use the new accessor APIs for storage_driver.
This commit is contained in:
John Ferlan 2017-07-26 12:27:26 -04:00
parent ccc8c311b2
commit 67129bb435
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/storage/storage_driver.c
View File

@ -832,7 +832,7 @@ storagePoolUndefine(virStoragePoolPtr pool)
goto cleanup; goto cleanup;
} }
if (obj->asyncjobs > 0) { if (virStoragePoolObjGetAsyncjobs(obj) > 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("pool '%s' has asynchronous jobs running."), _("pool '%s' has asynchronous jobs running."),
obj->def->name); obj->def->name);
@ -1014,7 +1014,7 @@ storagePoolDestroy(virStoragePoolPtr pool)
goto cleanup; goto cleanup;
} }
if (obj->asyncjobs > 0) { if (virStoragePoolObjGetAsyncjobs(obj) > 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("pool '%s' has asynchronous jobs running."), _("pool '%s' has asynchronous jobs running."),
obj->def->name); obj->def->name);
@ -1082,7 +1082,7 @@ storagePoolDelete(virStoragePoolPtr pool,
goto cleanup; goto cleanup;
} }
if (obj->asyncjobs > 0) { if (virStoragePoolObjGetAsyncjobs(obj) > 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("pool '%s' has asynchronous jobs running."), _("pool '%s' has asynchronous jobs running."),
obj->def->name); obj->def->name);
@ -1140,7 +1140,7 @@ storagePoolRefresh(virStoragePoolPtr pool,
goto cleanup; goto cleanup;
} }
if (obj->asyncjobs > 0) { if (virStoragePoolObjGetAsyncjobs(obj) > 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("pool '%s' has asynchronous jobs running."), _("pool '%s' has asynchronous jobs running."),
obj->def->name); obj->def->name);
@ -1827,7 +1827,7 @@ storageVolCreateXML(virStoragePoolPtr pool,
memcpy(buildvoldef, voldef, sizeof(*voldef)); memcpy(buildvoldef, voldef, sizeof(*voldef));
/* Drop the pool lock during volume allocation */ /* Drop the pool lock during volume allocation */
obj->asyncjobs++; virStoragePoolObjIncrAsyncjobs(obj);
voldef->building = true; voldef->building = true;
virStoragePoolObjUnlock(obj); virStoragePoolObjUnlock(obj);
@ -1840,7 +1840,7 @@ storageVolCreateXML(virStoragePoolPtr pool,
storageDriverUnlock(); storageDriverUnlock();
voldef->building = false; voldef->building = false;
obj->asyncjobs--; virStoragePoolObjDecrAsyncjobs(obj);
if (buildret < 0) { if (buildret < 0) {
/* buildVol handles deleting volume on failure */ /* buildVol handles deleting volume on failure */
@ -2020,13 +2020,13 @@ storageVolCreateXMLFrom(virStoragePoolPtr pool,
goto cleanup; goto cleanup;
/* Drop the pool lock during volume allocation */ /* Drop the pool lock during volume allocation */
obj->asyncjobs++; virStoragePoolObjIncrAsyncjobs(obj);
voldef->building = true; voldef->building = true;
voldefsrc->in_use++; voldefsrc->in_use++;
virStoragePoolObjUnlock(obj); virStoragePoolObjUnlock(obj);
if (objsrc) { if (objsrc) {
objsrc->asyncjobs++; virStoragePoolObjIncrAsyncjobs(objsrc);
virStoragePoolObjUnlock(objsrc); virStoragePoolObjUnlock(objsrc);
} }
@ -2040,10 +2040,10 @@ storageVolCreateXMLFrom(virStoragePoolPtr pool,
voldefsrc->in_use--; voldefsrc->in_use--;
voldef->building = false; voldef->building = false;
obj->asyncjobs--; virStoragePoolObjDecrAsyncjobs(obj);
if (objsrc) { if (objsrc) {
objsrc->asyncjobs--; virStoragePoolObjDecrAsyncjobs(objsrc);
virStoragePoolObjUnlock(objsrc); virStoragePoolObjUnlock(objsrc);
objsrc = NULL; objsrc = NULL;
} }