[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/6] vmdk: Rename VmdkMetaData.valid to new_allocation
From: |
Kevin Wolf |
Subject: |
[PATCH 1/6] vmdk: Rename VmdkMetaData.valid to new_allocation |
Date: |
Thu, 30 Apr 2020 15:30:02 +0200 |
m_data is used for zero clusters even though valid == 0. It really only
means that a new cluster was allocated in the image file. Rename it to
reflect this.
While at it, change it from int to bool, too.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/vmdk.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/block/vmdk.c b/block/vmdk.c
index 8ec18f35a5..5b09275578 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -180,7 +180,7 @@ typedef struct VmdkMetaData {
unsigned int l1_index;
unsigned int l2_index;
unsigned int l2_offset;
- int valid;
+ bool new_allocation;
uint32_t *l2_cache_entry;
} VmdkMetaData;
@@ -1492,7 +1492,7 @@ static int get_cluster_offset(BlockDriverState *bs,
unsigned int l2_size_bytes = extent->l2_size * extent->entry_size;
if (m_data) {
- m_data->valid = 0;
+ m_data->new_allocation = false;
}
if (extent->flat) {
*cluster_offset = extent->flat_start_offset;
@@ -1630,7 +1630,7 @@ static int get_cluster_offset(BlockDriverState *bs,
return ret;
}
if (m_data) {
- m_data->valid = 1;
+ m_data->new_allocation = true;
m_data->l1_index = l1_index;
m_data->l2_index = l2_index;
m_data->l2_offset = l2_offset;
@@ -2021,7 +2021,7 @@ static int vmdk_pwritev(BlockDriverState *bs, uint64_t
offset,
if (ret) {
return ret;
}
- if (m_data.valid) {
+ if (m_data.new_allocation) {
/* update L2 tables */
if (vmdk_L2update(extent, &m_data,
cluster_offset >> BDRV_SECTOR_BITS)
--
2.25.3
- [PATCH 0/6] vmdk: Fix zero cluster handling, Kevin Wolf, 2020/04/30
- [PATCH 2/6] vmdk: Fix zero cluster allocation, Kevin Wolf, 2020/04/30
- [PATCH 1/6] vmdk: Rename VmdkMetaData.valid to new_allocation,
Kevin Wolf <=
- [PATCH 3/6] vmdk: Fix partial overwrite of zero cluster, Kevin Wolf, 2020/04/30
- [PATCH 4/6] vmdk: Don't update L2 table for zero write on zero cluster, Kevin Wolf, 2020/04/30
- [PATCH 5/6] vmdk: Flush only once in vmdk_L2update(), Kevin Wolf, 2020/04/30
- [PATCH 6/6] iotests: vmdk: Enable zeroed_grained=on by default, Kevin Wolf, 2020/04/30