From: "Denis V. Lunev" <den@openvz.org>
To: qemu-block@nongnu.org, qemu-devel@nongnu.org
Cc: stefanha@redhat.com, alexander.ivanov@virtuozzo.com,
mike.maslenkin@gmail.com, "Denis V. Lunev" <den@openvz.org>
Subject: [PATCH 17/21] parallels: improve readability of allocate_clusters
Date: Fri, 15 Sep 2023 20:41:26 +0200 [thread overview]
Message-ID: <20230915184130.403366-20-den@openvz.org> (raw)
In-Reply-To: <20230915184130.403366-1-den@openvz.org>
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>
---
block/parallels.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index 2efa578e21..76aedfd7c4 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
next prev parent reply other threads:[~2023-09-15 18:44 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-15 18:41 [PATCH 00/21] implement discard operation for Parallels images Denis V. Lunev
2023-09-15 18:41 ` [PATCH 01/21] parallels: fix formatting in bdrv_parallels initialization Denis V. Lunev
2023-09-18 7:41 ` Alexander Ivanov
2023-09-18 7:42 ` Alexander Ivanov
2023-09-15 18:41 ` [PATCH 02/21] parallels: mark driver as supporting CBT Denis V. Lunev
2023-09-18 7:43 ` Alexander Ivanov
2023-09-15 18:41 ` Denis V. Lunev
2023-09-15 18:41 ` [PATCH 03/21] parallels: invent parallels_opts_prealloc() helper to parse prealloc opts Denis V. Lunev
2023-09-17 11:40 ` Mike Maslenkin
2023-09-17 13:06 ` Denis V. Lunev
2023-09-18 15:21 ` Alexander Ivanov
2023-09-15 18:41 ` [PATCH 04/21] parallels: return earler in fail_format branch in parallels_open() Denis V. Lunev
2023-09-18 8:14 ` Alexander Ivanov
2023-09-18 8:16 ` Alexander Ivanov
2023-09-18 8:17 ` Denis V. Lunev
2023-09-18 8:15 ` Alexander Ivanov
2023-09-15 18:41 ` [PATCH 05/21] parallels: return earlier from parallels_open() function on error Denis V. Lunev
2023-09-18 8:17 ` Alexander Ivanov
2023-09-15 18:41 ` [PATCH 06/21] parallels: refactor path when we need to re-check image in parallels_open Denis V. Lunev
2023-09-17 11:40 ` Mike Maslenkin
2023-09-17 13:04 ` Denis V. Lunev
2023-09-18 8:31 ` Alexander Ivanov
2023-09-15 18:41 ` [PATCH 07/21] parallels: create mark_used() helper which sets bit in used bitmap Denis V. Lunev
2023-09-18 8:46 ` Alexander Ivanov
2023-09-15 18:41 ` [PATCH 08/21] tests: ensure that image validation will not cure the corruption Denis V. Lunev
2023-09-18 9:03 ` Alexander Ivanov
2023-09-15 18:41 ` [PATCH 09/21] parallels: fix broken parallels_check_data_off() Denis V. Lunev
2023-09-18 9:11 ` Alexander Ivanov
2023-09-15 18:41 ` [PATCH 10/21] parallels: add test which will validate data_off fixes through repair Denis V. Lunev
2023-09-18 9:18 ` Alexander Ivanov
2023-09-15 18:41 ` [PATCH 11/21] parallels: collect bitmap of used clusters at open Denis V. Lunev
2023-09-18 11:36 ` Alexander Ivanov
2023-09-15 18:41 ` Denis V. Lunev
2023-09-15 18:41 ` [PATCH 12/21] tests: fix broken deduplication check in parallels format test Denis V. Lunev
2023-09-18 11:43 ` Alexander Ivanov
2023-09-15 18:41 ` [PATCH 13/21] tests: test self-cure of parallels image with duplicated clusters Denis V. Lunev
2023-09-18 11:51 ` Alexander Ivanov
2023-09-15 18:41 ` [PATCH 14/21] parallels: accept multiple clusters in mark_used() Denis V. Lunev
2023-09-18 11:53 ` Alexander Ivanov
2023-09-15 18:41 ` [PATCH 15/21] parallels: update used bitmap in allocate_cluster Denis V. Lunev
2023-09-18 11:58 ` Alexander Ivanov
2023-09-15 18:41 ` [PATCH 16/21] parallels: naive implementation of allocate_clusters with used bitmap Denis V. Lunev
2023-09-18 13:09 ` Alexander Ivanov
2023-09-18 13:14 ` Denis V. Lunev
2023-09-18 13:18 ` Alexander Ivanov
2023-09-15 18:41 ` Denis V. Lunev [this message]
2023-09-18 13:15 ` [PATCH 17/21] parallels: improve readability of allocate_clusters Alexander Ivanov
2023-09-15 18:41 ` [PATCH 18/21] parallels: naive implementation of parallels_co_pdiscard Denis V. Lunev
2023-09-17 11:40 ` Mike Maslenkin
2023-09-18 13:57 ` Alexander Ivanov
2023-09-18 14:05 ` Denis V. Lunev
2023-09-15 18:41 ` [PATCH 19/21] tests: extend test 131 to cover availability of the discard operation Denis V. Lunev
2023-09-18 15:09 ` Alexander Ivanov
2023-09-15 18:41 ` [PATCH 20/21] parallels: naive implementation of parallels_co_pwrite_zeroes Denis V. Lunev
2023-09-18 15:10 ` Alexander Ivanov
2023-09-15 18:41 ` [PATCH 21/21] tests: extend test 131 to cover availability of the write-zeroes Denis V. Lunev
2023-09-18 15:17 ` Alexander Ivanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230915184130.403366-20-den@openvz.org \
--to=den@openvz.org \
--cc=alexander.ivanov@virtuozzo.com \
--cc=mike.maslenkin@gmail.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).