diff options
| author | Eric Blake <eblake@redhat.com> | 2016-06-01 15:10:04 -0600 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-06-08 10:21:08 +0200 |
| commit | 74021bc497c8e8a1b03d633656aa5ff7112bd721 (patch) | |
| tree | cacba254786bf1652554e9d425c5c1951f9b0a57 /block/qcow2.c | |
| parent | d05aa8bb4a8b6aa9a915ec5074fb12ae632d2323 (diff) | |
block: Switch bdrv_write_zeroes() to byte interface
Rename to bdrv_pwrite_zeroes() to let the compiler ensure we
cater to the updated semantics. Do the same for bdrv_co_write_zeroes().
Signed-off-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/qcow2.c')
| -rw-r--r-- | block/qcow2.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index a6ea6cb62d..cc59efc184 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2655,8 +2655,8 @@ static int make_completely_empty(BlockDriverState *bs) /* After this call, neither the in-memory nor the on-disk refcount * information accurately describe the actual references */ - ret = bdrv_write_zeroes(bs->file->bs, s->l1_table_offset / BDRV_SECTOR_SIZE, - l1_clusters * s->cluster_sectors, 0); + ret = bdrv_pwrite_zeroes(bs->file->bs, s->l1_table_offset, + l1_clusters * s->cluster_size, 0); if (ret < 0) { goto fail_broken_refcounts; } @@ -2669,9 +2669,8 @@ static int make_completely_empty(BlockDriverState *bs) * overwrite parts of the existing refcount and L1 table, which is not * an issue because the dirty flag is set, complete data loss is in fact * desired and partial data loss is consequently fine as well */ - ret = bdrv_write_zeroes(bs->file->bs, s->cluster_size / BDRV_SECTOR_SIZE, - (2 + l1_clusters) * s->cluster_size / - BDRV_SECTOR_SIZE, 0); + ret = bdrv_pwrite_zeroes(bs->file->bs, s->cluster_size, + (2 + l1_clusters) * s->cluster_size, 0); /* This call (even if it failed overall) may have overwritten on-disk * refcount structures; in that case, the in-memory refcount information * will probably differ from the on-disk information which makes the BDS |