[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/22] parallels: improve readability of allocate_clusters
From: |
Denis V. Lunev |
Subject: |
[PULL 18/22] parallels: improve readability of allocate_clusters |
Date: |
Wed, 20 Sep 2023 11:21:04 +0200 |
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>
---
block/parallels.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index 6a5bff4fcb..d9d36c514b 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -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);
if (first_free == s->used_bmap_size) {
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;
@@ -289,8 +290,7 @@ allocate_clusters(BlockDriverState *bs, int64_t sector_num,
* force the safer-but-slower fallocate.
*/
if (s->prealloc_mode == PRL_PREALLOC_MODE_TRUNCATE) {
- ret = bdrv_co_truncate(bs->file,
- (s->data_end + space) << BDRV_SECTOR_BITS,
+ ret = bdrv_co_truncate(bs->file, host_off + bytes,
false, PREALLOC_MODE_OFF,
BDRV_REQ_ZERO_WRITE, NULL);
if (ret == -ENOTSUP) {
@@ -298,16 +298,13 @@ allocate_clusters(BlockDriverState *bs, int64_t
sector_num,
}
}
if (s->prealloc_mode == PRL_PREALLOC_MODE_FALLOCATE) {
- ret = bdrv_co_pwrite_zeroes(bs->file,
- s->data_end << BDRV_SECTOR_BITS,
- space << BDRV_SECTOR_BITS, 0);
+ ret = bdrv_co_pwrite_zeroes(bs->file, host_off, bytes, 0);
}
if (ret < 0) {
return ret;
}
- new_usedsize = s->used_bmap_size +
- (space << BDRV_SECTOR_BITS) / s->cluster_size;
+ new_usedsize = s->used_bmap_size + bytes / s->cluster_size;
s->used_bmap = bitmap_zero_extend(s->used_bmap, s->used_bmap_size,
new_usedsize);
s->used_bmap_size = new_usedsize;
--
2.34.1
- [PULL 07/22] parallels: refactor path when we need to re-check image in parallels_open, (continued)
- [PULL 07/22] parallels: refactor path when we need to re-check image in parallels_open, Denis V. Lunev, 2023/09/20
- [PULL 08/22] parallels: create mark_used() helper which sets bit in used bitmap, Denis V. Lunev, 2023/09/20
- [PULL 03/22] parallels: fix memory leak in parallels_open(), Denis V. Lunev, 2023/09/20
- [PULL 06/22] parallels: return earlier from parallels_open() function on error, Denis V. Lunev, 2023/09/20
- [PULL 09/22] tests: ensure that image validation will not cure the corruption, Denis V. Lunev, 2023/09/20
- [PULL 11/22] parallels: add test which will validate data_off fixes through repair, Denis V. Lunev, 2023/09/20
- [PULL 19/22] parallels: naive implementation of parallels_co_pdiscard, Denis V. Lunev, 2023/09/20
- [PULL 15/22] parallels: accept multiple clusters in mark_used(), Denis V. Lunev, 2023/09/20
- [PULL 22/22] tests: extend test 131 to cover availability of the write-zeroes, Denis V. Lunev, 2023/09/20
- [PULL 12/22] parallels: collect bitmap of used clusters at open, Denis V. Lunev, 2023/09/20
- [PULL 18/22] parallels: improve readability of allocate_clusters,
Denis V. Lunev <=
- [PULL 21/22] parallels: naive implementation of parallels_co_pwrite_zeroes, Denis V. Lunev, 2023/09/20
- [PULL 10/22] parallels: fix broken parallels_check_data_off(), Denis V. Lunev, 2023/09/20
- [PULL 16/22] parallels: update used bitmap in allocate_cluster, Denis V. Lunev, 2023/09/20
- [PULL 20/22] tests: extend test 131 to cover availability of the discard operation, Denis V. Lunev, 2023/09/20
- [PULL 17/22] parallels: naive implementation of allocate_clusters with used bitmap, Denis V. Lunev, 2023/09/20
- [PULL 13/22] tests: fix broken deduplication check in parallels format test, Denis V. Lunev, 2023/09/20
- [PULL 14/22] tests: test self-cure of parallels image with duplicated clusters, Denis V. Lunev, 2023/09/20
- Re: [PULL 00/22] implement discard operation for Parallels images, Stefan Hajnoczi, 2023/09/20