On 04/17/2017 09:33 PM, Eric Blake wrote:
> Now that the last user [mirror_iteration()] has converted to using
> bytes, we no longer need a function to round sectors to clusters.
>
> Signed-off-by: Eric Blake <ebl...@redhat.com>
Reviewed-by: John Snow <js...@redhat.com>
> ---
> include/block/block.h | 4 ----
> block/io.c | 21 ---------------------
> 2 files changed, 25 deletions(-)
>
> diff --git a/include/block/block.h b/include/block/block.h
> index 740cb86..86ad511 100644
> --- a/include/block/block.h
> +++ b/include/block/block.h
> @@ -467,10 +467,6 @@ const char *bdrv_get_device_or_node_name(const
> BlockDriverState *bs);
> int bdrv_get_flags(BlockDriverState *bs);
> int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi);
> ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs);
> -void bdrv_round_sectors_to_clusters(BlockDriverState *bs,
> - int64_t sector_num, int nb_sectors,
> - int64_t *cluster_sector_num,
> - int *cluster_nb_sectors);
> void bdrv_round_to_clusters(BlockDriverState *bs,
> int64_t offset, unsigned int bytes,
> int64_t *cluster_offset,
> diff --git a/block/io.c b/block/io.c
> index d22d35f..d61a906 100644
> --- a/block/io.c
> +++ b/block/io.c
> @@ -419,27 +419,6 @@ static void mark_request_serialising(BdrvTrackedRequest
> *req, uint64_t align)
> }
>
> /**
> - * Round a region to cluster boundaries (sector-based)
> - */
> -void bdrv_round_sectors_to_clusters(BlockDriverState *bs,
> - int64_t sector_num, int nb_sectors,
> - int64_t *cluster_sector_num,
> - int *cluster_nb_sectors)
> -{
> - BlockDriverInfo bdi;
> -
> - if (bdrv_get_info(bs, &bdi) < 0 || bdi.cluster_size == 0) {
> - *cluster_sector_num = sector_num;
> - *cluster_nb_sectors = nb_sectors;
> - } else {
> - int64_t c = bdi.cluster_size / BDRV_SECTOR_SIZE;
> - *cluster_sector_num = QEMU_ALIGN_DOWN(sector_num, c);
> - *cluster_nb_sectors = QEMU_ALIGN_UP(sector_num - *cluster_sector_num
> +
> - nb_sectors, c);
> - }
> -}
> -
> -/**
> * Round a region to cluster boundaries
> */
> void bdrv_round_to_clusters(BlockDriverState *bs,
>
--
—js
