| Message ID | 1491057878-27868-3-git-send-email-ashijeetacharya@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, 04/01 20:14, Ashijeet Acharya wrote: > Rename the existing function get_whole_cluster() to vmdk_perform_cow() > as its sole purpose is to perform COW for the first and the last > allocated clusters if needed. > > Signed-off-by: Ashijeet Acharya <ashijeetacharya@gmail.com> > --- > block/vmdk.c | 23 ++++++++++++++--------- > 1 file changed, 14 insertions(+), 9 deletions(-) > > diff --git a/block/vmdk.c b/block/vmdk.c > index 22be887..73ae786 100644 > --- a/block/vmdk.c > +++ b/block/vmdk.c > @@ -1028,8 +1028,8 @@ static void vmdk_refresh_limits(BlockDriverState *bs, Error **errp) > } > } > > -/** > - * get_whole_cluster > +/* > + * vmdk_perform_cow > * > * Copy backing file's cluster that covers @sector_num, otherwise write zero, > * to the cluster at @cluster_sector_num. > @@ -1037,13 +1037,18 @@ static void vmdk_refresh_limits(BlockDriverState *bs, Error **errp) > * If @skip_start_sector < @skip_end_sector, the relative range > * [@skip_start_sector, @skip_end_sector) is not copied or written, and leave > * it for call to write user data in the request. > + * > + * Returns: > + * VMDK_OK: on success > + * > + * VMDK_ERROR: in error cases > */ > -static int get_whole_cluster(BlockDriverState *bs, > - VmdkExtent *extent, > - uint64_t cluster_offset, > - uint64_t offset, > - uint64_t skip_start_bytes, > - uint64_t skip_end_bytes) > +static int vmdk_perform_cow(BlockDriverState *bs, > + VmdkExtent *extent, > + uint64_t cluster_offset, > + uint64_t offset, > + uint64_t skip_start_bytes, > + uint64_t skip_end_bytes) > { > int ret = VMDK_OK; > int64_t cluster_bytes; > @@ -1244,7 +1249,7 @@ static int get_cluster_offset(BlockDriverState *bs, > * This problem may occur because of insufficient space on host disk > * or inappropriate VM shutdown. > */ > - ret = get_whole_cluster(bs, extent, cluster_sector * BDRV_SECTOR_SIZE, > + ret = vmdk_perform_cow(bs, extent, cluster_sector * BDRV_SECTOR_SIZE, > offset, skip_start_bytes, skip_end_bytes); > if (ret) { > return ret; > -- > 2.6.2 > Reviewed-by: Fam Zheng <famz@redhat.com>
diff --git a/block/vmdk.c b/block/vmdk.c index 22be887..73ae786 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1028,8 +1028,8 @@ static void vmdk_refresh_limits(BlockDriverState *bs, Error **errp) } } -/** - * get_whole_cluster +/* + * vmdk_perform_cow * * Copy backing file's cluster that covers @sector_num, otherwise write zero, * to the cluster at @cluster_sector_num. @@ -1037,13 +1037,18 @@ static void vmdk_refresh_limits(BlockDriverState *bs, Error **errp) * If @skip_start_sector < @skip_end_sector, the relative range * [@skip_start_sector, @skip_end_sector) is not copied or written, and leave * it for call to write user data in the request. + * + * Returns: + * VMDK_OK: on success + * + * VMDK_ERROR: in error cases */ -static int get_whole_cluster(BlockDriverState *bs, - VmdkExtent *extent, - uint64_t cluster_offset, - uint64_t offset, - uint64_t skip_start_bytes, - uint64_t skip_end_bytes) +static int vmdk_perform_cow(BlockDriverState *bs, + VmdkExtent *extent, + uint64_t cluster_offset, + uint64_t offset, + uint64_t skip_start_bytes, + uint64_t skip_end_bytes) { int ret = VMDK_OK; int64_t cluster_bytes; @@ -1244,7 +1249,7 @@ static int get_cluster_offset(BlockDriverState *bs, * This problem may occur because of insufficient space on host disk * or inappropriate VM shutdown. */ - ret = get_whole_cluster(bs, extent, cluster_sector * BDRV_SECTOR_SIZE, + ret = vmdk_perform_cow(bs, extent, cluster_sector * BDRV_SECTOR_SIZE, offset, skip_start_bytes, skip_end_bytes); if (ret) { return ret;
Rename the existing function get_whole_cluster() to vmdk_perform_cow() as its sole purpose is to perform COW for the first and the last allocated clusters if needed. Signed-off-by: Ashijeet Acharya <ashijeetacharya@gmail.com> --- block/vmdk.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)