[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 24/34] qcow2: Add subcluster support to check_refcounts_l2()
From: |
Alberto Garcia |
Subject: |
[PATCH v8 24/34] qcow2: Add subcluster support to check_refcounts_l2() |
Date: |
Wed, 10 Jun 2020 17:03:02 +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 <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
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 v8 14/34] qcow2: Add QCow2SubclusterType and qcow2_get_subcluster_type(), (continued)
- [PATCH v8 14/34] qcow2: Add QCow2SubclusterType and qcow2_get_subcluster_type(), Alberto Garcia, 2020/06/10
- [PATCH v8 31/34] qcow2: Add the 'extended_l2' option and the QCOW2_INCOMPAT_EXTL2 bit, Alberto Garcia, 2020/06/10
- [PATCH v8 21/34] qcow2: Add subcluster support to qcow2_get_host_offset(), Alberto Garcia, 2020/06/10
- [PATCH v8 30/34] qcow2: Add prealloc field to QCowL2Meta, Alberto Garcia, 2020/06/10
- [PATCH v8 27/34] qcow2: Add subcluster support to handle_alloc_space(), Alberto Garcia, 2020/06/10
- [PATCH v8 25/34] qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2(), Alberto Garcia, 2020/06/10
- [PATCH v8 26/34] qcow2: Clear the L2 bitmap when allocating a compressed cluster, Alberto Garcia, 2020/06/10
- [PATCH v8 17/34] qcow2: Add cluster type parameter to qcow2_get_host_offset(), Alberto Garcia, 2020/06/10
- [PATCH v8 20/34] qcow2: Add subcluster support to calculate_l2_meta(), Alberto Garcia, 2020/06/10
- [PATCH v8 24/34] qcow2: Add subcluster support to check_refcounts_l2(),
Alberto Garcia <=
- [PATCH v8 18/34] qcow2: Replace QCOW2_CLUSTER_* with QCOW2_SUBCLUSTER_*, Alberto Garcia, 2020/06/10
- [PATCH v8 28/34] qcow2: Add subcluster support to qcow2_co_pwrite_zeroes(), Alberto Garcia, 2020/06/10
- [PATCH v8 34/34] iotests: Add tests for qcow2 images with extended L2 entries, Alberto Garcia, 2020/06/10
- Re: [PATCH v8 00/34] Add subcluster allocation to qcow2, Eric Blake, 2020/06/10
- Re: [PATCH v8 00/34] Add subcluster allocation to qcow2, no-reply, 2020/06/10
- Re: [PATCH v8 00/34] Add subcluster allocation to qcow2, no-reply, 2020/06/10