[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v3 18/27] qcow2: Add subcluster support to check_refcounts_l2
From: |
Alberto Garcia |
Subject: |
[RFC PATCH v3 18/27] qcow2: Add subcluster support to check_refcounts_l2() |
Date: |
Sun, 22 Dec 2019 12:36:59 +0100 |
Setting the QCOW_OFLAG_ZERO bit of the L2 entry is forbidden if an
image has subclusters. Instead, the individual 'all zeroes' bits must
be used.
Signed-off-by: Alberto Garcia <address@hidden>
---
block/qcow2-refcount.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index de85ed29a4..65f4fc27c3 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1685,8 +1685,13 @@ static int check_refcounts_l2(BlockDriverState *bs,
BdrvCheckResult *res,
int ign = active ? QCOW2_OL_ACTIVE_L2 :
QCOW2_OL_INACTIVE_L2;
- l2_entry = QCOW_OFLAG_ZERO;
- set_l2_entry(s, l2_table, i, l2_entry);
+ if (has_subclusters(s)) {
+ set_l2_entry(s, l2_table, i, 0);
+ set_l2_bitmap(s, l2_table, i,
+ QCOW_L2_BITMAP_ALL_ZEROES);
+ } else {
+ set_l2_entry(s, l2_table, i, QCOW_OFLAG_ZERO);
+ }
ret = qcow2_pre_write_overlap_check(bs, ign,
l2e_offset, l2_entry_size(s), false);
if (ret < 0) {
--
2.20.1
- [RFC PATCH v3 00/27] Add subcluster allocation to qcow2, Alberto Garcia, 2019/12/22
- [RFC PATCH v3 16/27] qcow2: Add subcluster support to zero_in_l2_slice(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 07/27] qcow2: Add subcluster-related fields to BDRVQcow2State, Alberto Garcia, 2019/12/22
- [RFC PATCH v3 18/27] qcow2: Add subcluster support to check_refcounts_l2(),
Alberto Garcia <=
- [RFC PATCH v3 17/27] qcow2: Add subcluster support to discard_in_l2_slice(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 10/27] qcow2: Update get/set_l2_entry() and add get/set_l2_bitmap(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 01/27] qcow2: Add calculate_l2_meta(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 24/27] qcow2: Restrict qcow2_co_pwrite_zeroes() to full clusters only, Alberto Garcia, 2019/12/22
- [RFC PATCH v3 11/27] qcow2: Add QCow2SubclusterType and qcow2_get_subcluster_type(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 03/27] qcow2: Process QCOW2_CLUSTER_ZERO_ALLOC clusters in handle_copied(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 27/27] iotests: Add tests for qcow2 images with extended L2 entries, Alberto Garcia, 2019/12/22
- [RFC PATCH v3 21/27] qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2(), Alberto Garcia, 2019/12/22
- [RFC PATCH v3 13/27] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC, Alberto Garcia, 2019/12/22
- [RFC PATCH v3 19/27] qcow2: Add subcluster support to expand_zero_clusters_in_l1(), Alberto Garcia, 2019/12/22