External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-21 20:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify allocation check in storageVolResize

Browse Source 
Since shrinking a volume below existing allocation is not allowed,
it is not possible for a successful resize with VOL_RESIZE_ALLOCATE
to increase the pool's available value.

Even with the SHRINK flag it is possible to extend the current
allocation or even the capacity. Remove the overflow when
computing delta with this flag and do the check even if the
flag was specified.

https://bugzilla.redhat.com/show_bug.cgi?id=1073305
This commit is contained in:
Ján Tomko 2015-05-27 15:39:07 +02:00
parent 30ae685780
commit 7211f66ad7
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/storage/storage_driver.c
View File

@ -2292,7 +2292,7 @@ storageVolResize(virStorageVolPtr obj,
virStorageBackendPtr backend;
virStoragePoolObjPtr pool = NULL;
virStorageVolDefPtr vol = NULL;
unsigned long long abs_capacity, delta;
unsigned long long abs_capacity, delta = 0;
int ret = -1;
virCheckFlags(VIR_STORAGE_VOL_RESIZE_ALLOCATE |
@ -2341,18 +2341,10 @@ storageVolResize(virStorageVolPtr obj,
goto cleanup;
}
if (flags & VIR_STORAGE_VOL_RESIZE_SHRINK)
delta = vol->target.allocation - abs_capacity;
else
if (flags & VIR_STORAGE_VOL_RESIZE_ALLOCATE)
delta = abs_capacity - vol->target.allocation;
/* If the operation is going to increase the allocation value and not
* just the capacity value, then let's make sure there's enough space
* in the pool in order to perform that operation
*/
if (flags & VIR_STORAGE_VOL_RESIZE_ALLOCATE &&
!(flags & VIR_STORAGE_VOL_RESIZE_SHRINK) &&
delta > pool->def->available) {
if (delta > pool->def->available) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("Not enough space left in storage pool"));
goto cleanup;
@ -2375,15 +2367,8 @@ storageVolResize(virStorageVolPtr obj,
*/
if (flags & VIR_STORAGE_VOL_RESIZE_ALLOCATE) {
vol->target.allocation = abs_capacity;
/* Update pool metadata */
if (flags & VIR_STORAGE_VOL_RESIZE_SHRINK) {
pool->def->allocation -= delta;
pool->def->available += delta;
} else {
pool->def->allocation += delta;
pool->def->available -= delta;
}
pool->def->allocation += delta;
pool->def->available -= delta;
}
ret = 0;