On 05/14/2016 06:01 AM, Denis V. Lunev wrote: > Unaligned request could occupy only one cluster. This is true since the
s/request could/requests will/
> previous commit. Simplify the code taking this considiration into
s/considiration/consideration/
> account.
>
> There are no other changes so far.
>
> Signed-off-by: Denis V. Lunev <d...@openvz.org>
> CC: Kevin Wolf <kw...@redhat.com>
> ---
> block/qcow2.c | 23 +++++------------------
> 1 file changed, 5 insertions(+), 18 deletions(-)
>
> diff --git a/block/qcow2.c b/block/qcow2.c
> index 62febfc..9a54bbd 100644
> --- a/block/qcow2.c
> +++ b/block/qcow2.c
> @@ -2436,33 +2436,20 @@ static coroutine_fn int
> qcow2_co_write_zeroes(BlockDriverState *bs,
> int tail = (sector_num + nb_sectors) % s->cluster_sectors;
>
> if (head != 0 || tail != 0) {
> - int64_t cl_end = -1;
> + int64_t cl_start = sector_num - head;
>
> - sector_num -= head;
> - nb_sectors += head;
> + assert(cl_start + s->cluster_sectors >= sector_num + nb_sectors);
In other words, the caller is now buggy if it ever passes us an
unaligned request that crosses cluster boundaries (the only requests
that can cross boundaries will be aligned).
With the grammar fix in the commit message,
Reviewed-by: Eric Blake <ebl...@redhat.com>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
