From 3efffc3292d94271a15b1606b4a56adf6c6f04ed Mon Sep 17 00:00:00 2001 From: Radoslav Gerganov Date: Thu, 10 Sep 2015 10:53:14 +0300 Subject: vmdk: Fix next_cluster_sector for compressed write When the VMDK is streamOptimized (or compressed), the next_cluster_sector must not be incremented by a fixed number of sectors. Instead of this, it must be rounded up to the next consecutive sector. Fixing this results in much smaller compressed images. Signed-off-by: Radoslav Gerganov Reviewed-by: Fam Zheng Signed-off-by: Kevin Wolf --- block/vmdk.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'block') diff --git a/block/vmdk.c b/block/vmdk.c index 7bdc3d0f3d..be0d6401af 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1324,8 +1324,12 @@ static int vmdk_write_extent(VmdkExtent *extent, int64_t cluster_offset, write_end_sector = DIV_ROUND_UP(write_offset + write_len, BDRV_SECTOR_SIZE); - extent->next_cluster_sector = MAX(extent->next_cluster_sector, - write_end_sector); + if (extent->compressed) { + extent->next_cluster_sector = write_end_sector; + } else { + extent->next_cluster_sector = MAX(extent->next_cluster_sector, + write_end_sector); + } if (ret != write_len) { ret = ret < 0 ? ret : -EIO; -- cgit v1.2.1