External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

virStoragePoolObjAddVol: Simplify error path

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Tim Wiederhake 2022-04-11 13:27:41 +02:00
parent a5af1a437c
commit 8283450370
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/conf/virstorageobj.c
View File

@ -636,14 +636,18 @@ virStoragePoolObjAddVol(virStoragePoolObj *obj,
virObjectRWLockWrite(volumes); virObjectRWLockWrite(volumes);
if (!(volobj = virStorageVolObjNew()))
goto error;
if (!voldef->key || !voldef->name || !voldef->target.path || if (!voldef->key || !voldef->name || !voldef->target.path ||
g_hash_table_contains(volumes->objsKey, voldef->key) || g_hash_table_contains(volumes->objsKey, voldef->key) ||
g_hash_table_contains(volumes->objsName, voldef->name) || g_hash_table_contains(volumes->objsName, voldef->name) ||
g_hash_table_contains(volumes->objsPath, voldef->target.path)) g_hash_table_contains(volumes->objsPath, voldef->target.path)) {
goto error; virObjectRWUnlock(volumes);
return -1;
}
if (!(volobj = virStorageVolObjNew())) {
virObjectRWUnlock(volumes);
return -1;
}
g_hash_table_insert(volumes->objsKey, g_strdup(voldef->key), volobj); g_hash_table_insert(volumes->objsKey, g_strdup(voldef->key), volobj);
virObjectRef(volobj); virObjectRef(volobj);
@ -655,14 +659,10 @@ virStoragePoolObjAddVol(virStoragePoolObj *obj,
virObjectRef(volobj); virObjectRef(volobj);
volobj->voldef = voldef; volobj->voldef = voldef;
virObjectRWUnlock(volumes);
virStorageVolObjEndAPI(&volobj);
return 0;
error:
virStorageVolObjEndAPI(&volobj); virStorageVolObjEndAPI(&volobj);
virObjectRWUnlock(volumes); virObjectRWUnlock(volumes);
return -1; return 0;
} }