[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 19/23] qcow2: Fix offset calculation in handle_dependencies()
From: |
Alberto Garcia |
Subject: |
[RFC PATCH 19/23] qcow2: Fix offset calculation in handle_dependencies() |
Date: |
Tue, 15 Oct 2019 18:23:30 +0300 |
l2meta_cow_start() and l2meta_cow_end() are not necessarily
cluster-aligned if the image has subclusters, so update the
calculation of old_start and old_end to guarantee that no two requests
try to write on the same cluster.
Signed-off-by: Alberto Garcia <address@hidden>
---
block/qcow2-cluster.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index dc72f0e595..75579c1470 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -1262,8 +1262,8 @@ static int handle_dependencies(BlockDriverState *bs,
uint64_t guest_offset,
uint64_t start = guest_offset;
uint64_t end = start + bytes;
- uint64_t old_start = l2meta_cow_start(old_alloc);
- uint64_t old_end = l2meta_cow_end(old_alloc);
+ uint64_t old_start = start_of_cluster(s, l2meta_cow_start(old_alloc));
+ uint64_t old_end = ROUND_UP(l2meta_cow_end(old_alloc),
s->cluster_size);
if (end <= old_start || start >= old_end) {
/* No intersection */
--
2.20.1
- [RFC PATCH 04/23] qcow2: Add get_l2_entry() and set_l2_entry(), (continued)
- [RFC PATCH 04/23] qcow2: Add get_l2_entry() and set_l2_entry(), Alberto Garcia, 2019/10/15
- [RFC PATCH 08/23] qcow2: Add offset_to_sc_index(), Alberto Garcia, 2019/10/15
- [RFC PATCH 11/23] qcow2: Add qcow2_get_subcluster_type(), Alberto Garcia, 2019/10/15
- [RFC PATCH 15/23] qcow2: Add subcluster support to zero_in_l2_slice(), Alberto Garcia, 2019/10/15
- [RFC PATCH 22/23] qcow2: Restrict qcow2_co_pwrite_zeroes() to full clusters only, Alberto Garcia, 2019/10/15
- [RFC PATCH 07/23] qcow2: Add subcluster-related fields to BDRVQcow2State, Alberto Garcia, 2019/10/15
- [RFC PATCH 20/23] qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2(), Alberto Garcia, 2019/10/15
- [RFC PATCH 02/23] qcow2: Split cluster_needs_cow() out of count_cow_clusters(), Alberto Garcia, 2019/10/15
- [RFC PATCH 14/23] qcow2: Add subcluster support to qcow2_get_cluster_offset(), Alberto Garcia, 2019/10/15
- [RFC PATCH 18/23] qcow2: Add subcluster support to expand_zero_clusters_in_l1(), Alberto Garcia, 2019/10/15
- [RFC PATCH 19/23] qcow2: Fix offset calculation in handle_dependencies(),
Alberto Garcia <=
- [RFC PATCH 23/23] qcow2: Add the 'extended_l2' option and the QCOW2_INCOMPAT_EXTL2 bit, Alberto Garcia, 2019/10/15
- [RFC PATCH 13/23] qcow2: Add subcluster support to calculate_l2_meta(), Alberto Garcia, 2019/10/15
- [RFC PATCH 21/23] qcow2: Add subcluster support to handle_alloc_space(), Alberto Garcia, 2019/10/15
- [RFC PATCH 17/23] qcow2: Add subcluster support to check_refcounts_l2(), Alberto Garcia, 2019/10/15
- Re: [RFC PATCH 00/23] Add subcluster allocation to qcow2, Eric Blake, 2019/10/15
- Re: [RFC PATCH 00/23] Add subcluster allocation to qcow2, Vladimir Sementsov-Ogievskiy, 2019/10/23