[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 28/39] qcow2: Read refcount before L2 table in ex
From: |
Alberto Garcia |
Subject: |
[Qemu-block] [PATCH v4 28/39] qcow2: Read refcount before L2 table in expand_zero_clusters_in_l1() |
Date: |
Mon, 5 Feb 2018 16:33:28 +0200 |
At the moment it doesn't really make a difference whether we call
qcow2_get_refcount() before of after reading the L2 table, but if we
want to support L2 slices we'll need to read the refcount first.
This patch simply changes the order of those two operations to prepare
for that. The patch with the actual semantic changes will be easier to
read because of this.
Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block/qcow2-cluster.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 068d1ee0a0..ecfd4e7019 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -1899,6 +1899,12 @@ static int expand_zero_clusters_in_l1(BlockDriverState
*bs, uint64_t *l1_table,
goto fail;
}
+ ret = qcow2_get_refcount(bs, l2_offset >> s->cluster_bits,
+ &l2_refcount);
+ if (ret < 0) {
+ goto fail;
+ }
+
if (is_active_l1) {
/* get active L2 tables from cache */
ret = qcow2_cache_get(bs, s->l2_table_cache, l2_offset,
@@ -1912,12 +1918,6 @@ static int expand_zero_clusters_in_l1(BlockDriverState
*bs, uint64_t *l1_table,
goto fail;
}
- ret = qcow2_get_refcount(bs, l2_offset >> s->cluster_bits,
- &l2_refcount);
- if (ret < 0) {
- goto fail;
- }
-
for (j = 0; j < s->l2_size; j++) {
uint64_t l2_entry = be64_to_cpu(l2_table[j]);
int64_t offset = l2_entry & L2E_OFFSET_MASK;
--
2.11.0
- [Qemu-block] [PATCH v4 32/39] qcow2: Rename l2_table in qcow2_alloc_compressed_cluster_offset(), (continued)
- [Qemu-block] [PATCH v4 32/39] qcow2: Rename l2_table in qcow2_alloc_compressed_cluster_offset(), Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 30/39] qcow2: Update expand_zero_clusters_in_l1() to support L2 slices, Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 31/39] qcow2: Update qcow2_truncate() to support L2 slices, Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 39/39] iotests: Add l2-cache-entry-size to iotest 137, Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 22/39] qcow2: Update handle_copied() to support L2 slices, Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 27/39] qcow2: Update qcow2_update_snapshot_refcount() to support L2 slices, Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 28/39] qcow2: Read refcount before L2 table in expand_zero_clusters_in_l1(),
Alberto Garcia <=
- [Qemu-block] [PATCH v4 14/39] qcow2: Add offset_to_l2_slice_index(), Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 29/39] qcow2: Prepare expand_zero_clusters_in_l1() for adding L2 slice support, Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 21/39] qcow2: Update qcow2_alloc_cluster_link_l2() to support L2 slices, Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 18/39] qcow2: Refactor get_cluster_table(), Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 26/39] qcow2: Prepare qcow2_update_snapshot_refcount() for adding L2 slice support, Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 19/39] qcow2: Update get_cluster_table() to support L2 slices, Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 25/39] qcow2: Update zero_single_l2() to support L2 slices, Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 16/39] qcow2: Prepare l2_allocate() for adding L2 slice support, Alberto Garcia, 2018/02/05
- [Qemu-block] [PATCH v4 23/39] qcow2: Update handle_alloc() to support L2 slices, Alberto Garcia, 2018/02/05