diff options
| author | Reda Sallahi <fullmanet@gmail.com> | 2016-07-07 10:42:49 +0200 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2016-07-13 13:41:39 +0200 |
| commit | 524089bce43fd1cd3daaca979872451efa2cf7c6 (patch) | |
| tree | 3101cfa7b9f5457ffdc6bfc2da4b8a5905d02b90 /block | |
| parent | f14a39ccb922ee123741ae2cf70a10eef9a650fc (diff) | |
| download | qemu-524089bce43fd1cd3daaca979872451efa2cf7c6.zip qemu-524089bce43fd1cd3daaca979872451efa2cf7c6.tar.gz qemu-524089bce43fd1cd3daaca979872451efa2cf7c6.tar.bz2 | |
vmdk: fix metadata write regression
Commit "cdeaf1f vmdk: add bdrv_co_write_zeroes" causes a regression on
writes. It writes metadata after every write instead of doing it only once
for each cluster.
vmdk_pwritev() writes metadata whenever m_data is set as valid so this patch
sets m_data as valid only when we have a new cluster which hasn't been
allocated before or a zero grain.
Signed-off-by: Reda Sallahi <fullmanet@gmail.com>
Message-id: 20160707084249.29084-1-fullmanet@gmail.com
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/vmdk.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/block/vmdk.c b/block/vmdk.c index c9914f7..46d474e 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1202,13 +1202,6 @@ static int get_cluster_offset(BlockDriverState *bs, l2_index = ((offset >> 9) / extent->cluster_sectors) % extent->l2_size; cluster_sector = le32_to_cpu(l2_table[l2_index]); - if (m_data) { - m_data->valid = 1; - m_data->l1_index = l1_index; - m_data->l2_index = l2_index; - m_data->l2_offset = l2_offset; - m_data->l2_cache_entry = &l2_table[l2_index]; - } if (extent->has_zero_grain && cluster_sector == VMDK_GTE_ZEROED) { zeroed = true; } @@ -1231,6 +1224,13 @@ static int get_cluster_offset(BlockDriverState *bs, if (ret) { return ret; } + if (m_data) { + m_data->valid = 1; + m_data->l1_index = l1_index; + m_data->l2_index = l2_index; + m_data->l2_offset = l2_offset; + m_data->l2_cache_entry = &l2_table[l2_index]; + } } *cluster_offset = cluster_sector << BDRV_SECTOR_BITS; return VMDK_OK; |