[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 24/32] qcow2: Add subcluster support to check_refcounts_l2()
From: |
Alberto Garcia |
Subject: |
[PATCH v6 24/32] qcow2: Add subcluster support to check_refcounts_l2() |
Date: |
Sun, 24 May 2020 16:51:44 +0200 |
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>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <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 770c5dbc83..696e4dad07 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1686,8 +1686,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
- [PATCH v6 05/32] qcow2: Process QCOW2_CLUSTER_ZERO_ALLOC clusters in handle_copied(), (continued)
- [PATCH v6 05/32] qcow2: Process QCOW2_CLUSTER_ZERO_ALLOC clusters in handle_copied(), Alberto Garcia, 2020/05/24
- [PATCH v6 01/32] qcow2: Make Qcow2AioTask store the full host offset, Alberto Garcia, 2020/05/24
- [PATCH v6 06/32] qcow2: Add get_l2_entry() and set_l2_entry(), Alberto Garcia, 2020/05/24
- [PATCH v6 23/32] qcow2: Add subcluster support to discard_in_l2_slice(), Alberto Garcia, 2020/05/24
- [PATCH v6 12/32] qcow2: Add l2_entry_size(), Alberto Garcia, 2020/05/24
- [PATCH v6 16/32] qcow2: Add qcow2_cluster_is_allocated(), Alberto Garcia, 2020/05/24
- [PATCH v6 09/32] qcow2: Add subcluster-related fields to BDRVQcow2State, Alberto Garcia, 2020/05/24
- [PATCH v6 02/32] qcow2: Convert qcow2_get_cluster_offset() into qcow2_get_host_offset(), Alberto Garcia, 2020/05/24
- [PATCH v6 22/32] qcow2: Add subcluster support to zero_in_l2_slice(), Alberto Garcia, 2020/05/24
- [PATCH v6 17/32] qcow2: Add cluster type parameter to qcow2_get_host_offset(), Alberto Garcia, 2020/05/24
- [PATCH v6 24/32] qcow2: Add subcluster support to check_refcounts_l2(),
Alberto Garcia <=
- [PATCH v6 26/32] qcow2: Clear the L2 bitmap when allocating a compressed cluster, Alberto Garcia, 2020/05/24
- [PATCH v6 28/32] qcow2: Add subcluster support to qcow2_co_pwrite_zeroes(), Alberto Garcia, 2020/05/24
- [PATCH v6 27/32] qcow2: Add subcluster support to handle_alloc_space(), Alberto Garcia, 2020/05/24
- [PATCH v6 19/32] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC, Alberto Garcia, 2020/05/24
- [PATCH v6 25/32] qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2(), Alberto Garcia, 2020/05/24
- [PATCH v6 11/32] qcow2: Add offset_into_subcluster() and size_to_subclusters(), Alberto Garcia, 2020/05/24
- [PATCH v6 15/32] qcow2: Add qcow2_get_subcluster_range_type(), Alberto Garcia, 2020/05/24
- [PATCH v6 07/32] qcow2: Document the Extended L2 Entries feature, Alberto Garcia, 2020/05/24
- [PATCH v6 13/32] qcow2: Update get/set_l2_entry() and add get/set_l2_bitmap(), Alberto Garcia, 2020/05/24