motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-21 17:11:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

parallels: improve readability of allocate_clusters

Browse source 
Replace 'space' representing the amount of data to preallocate with
'bytes'.

Rationale:
* 'space' at each place is converted to bytes
* the unit is more close to the variable name

Signed-off-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
This commit is contained in:
Denis V. Lunev 2023-09-18 20:00:56 +02:00
parent 3ac10d1909
commit 66d201dd5a
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
block/parallels.c
View file

@ -279,7 +279,8 @@ allocate_clusters(BlockDriverState *bs, int64_t sector_num,
first_free = find_first_zero_bit(s->used_bmap, s->used_bmap_size); first_free = find_first_zero_bit(s->used_bmap, s->used_bmap_size);
if (first_free == s->used_bmap_size) { if (first_free == s->used_bmap_size) {
uint32_t new_usedsize; uint32_t new_usedsize;
int64_t space = to_allocate * s->tracks + s->prealloc_size; int64_t bytes = to_allocate * s->cluster_size;
bytes += s->prealloc_size * BDRV_SECTOR_SIZE;
host_off = s->data_end * BDRV_SECTOR_SIZE; host_off = s->data_end * BDRV_SECTOR_SIZE;
@ -289,8 +290,7 @@ allocate_clusters(BlockDriverState *bs, int64_t sector_num,
* force the safer-but-slower fallocate. * force the safer-but-slower fallocate.
*/ */
if (s->prealloc_mode == PRL_PREALLOC_MODE_TRUNCATE) { if (s->prealloc_mode == PRL_PREALLOC_MODE_TRUNCATE) {
ret = bdrv_co_truncate(bs->file, ret = bdrv_co_truncate(bs->file, host_off + bytes,
(s->data_end + space) << BDRV_SECTOR_BITS,
false, PREALLOC_MODE_OFF, false, PREALLOC_MODE_OFF,
BDRV_REQ_ZERO_WRITE, NULL); BDRV_REQ_ZERO_WRITE, NULL);
if (ret == -ENOTSUP) { if (ret == -ENOTSUP) {
@ -298,16 +298,13 @@ allocate_clusters(BlockDriverState *bs, int64_t sector_num,
} }
} }
if (s->prealloc_mode == PRL_PREALLOC_MODE_FALLOCATE) { if (s->prealloc_mode == PRL_PREALLOC_MODE_FALLOCATE) {
ret = bdrv_co_pwrite_zeroes(bs->file, ret = bdrv_co_pwrite_zeroes(bs->file, host_off, bytes, 0);
s->data_end << BDRV_SECTOR_BITS,
space << BDRV_SECTOR_BITS, 0);
} }
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
new_usedsize = s->used_bmap_size + new_usedsize = s->used_bmap_size + bytes / s->cluster_size;
(space << BDRV_SECTOR_BITS) / s->cluster_size;
s->used_bmap = bitmap_zero_extend(s->used_bmap, s->used_bmap_size, s->used_bmap = bitmap_zero_extend(s->used_bmap, s->used_bmap_size,
new_usedsize); new_usedsize);
s->used_bmap_size = new_usedsize; s->used_bmap_size = new_usedsize;