External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-24 04:12:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

virStorageFileGetMetadataRecurse: Shuffle around assignment of backing chain depth

Browse Source 
Move the assignment to a place where we know that the backing store is
present rather than having to check in the cleanup section.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Peter Krempa 2020-02-17 10:34:47 +01:00
parent 84df98f29e
commit b347e5c7dd
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/util/virstoragefile.c
View File

@ -5053,14 +5053,15 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
ret = 0; ret = 0;
goto cleanup; goto cleanup;
} }
backingStore->id = depth;
src->backingStore = g_steal_pointer(&backingStore);
} else { } else {
/* add terminator */ /* add terminator */
if (!(backingStore = virStorageSourceNew())) if (!(src->backingStore = virStorageSourceNew()))
goto cleanup; goto cleanup;
} }
src->backingStore = g_steal_pointer(&backingStore);
if (src->externalDataStoreRaw) { if (src->externalDataStoreRaw) {
g_autoptr(virStorageSource) externalDataStore = NULL; g_autoptr(virStorageSource) externalDataStore = NULL;
@ -5080,8 +5081,6 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
ret = 0; ret = 0;
cleanup: cleanup:
if (virStorageSourceHasBacking(src))
src->backingStore->id = depth;
virStorageFileDeinit(src); virStorageFileDeinit(src);
return ret; return ret;
} }