[v1] drop unallocated_blocks_are_zero

[PATCH 4/8] block/iscsi: drop unallocated_blocks_are_zero

Posted by Vladimir Sementsov-Ogievskiy 5 years, 6 months ago

We set bdi->unallocated_blocks_are_zero = iscsilun->lbprz, but
iscsi_co_block_status doesn't return 0 in case of iscsilun->lbprz, it
returns ZERO when appropriate. So actually unallocated_blocks_are_zero
is useless. Drop it now.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 block/iscsi.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/block/iscsi.c b/block/iscsi.c
index a8b76979d8..767e3e75fd 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -2163,7 +2163,6 @@ static int coroutine_fn iscsi_co_truncate(BlockDriverState *bs, int64_t offset,
 static int iscsi_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
 {
     IscsiLun *iscsilun = bs->opaque;
-    bdi->unallocated_blocks_are_zero = iscsilun->lbprz;
     bdi->cluster_size = iscsilun->cluster_size;
     return 0;
 }
-- 
2.21.0

Re: [PATCH 4/8] block/iscsi: drop unallocated_blocks_are_zero

Posted by Eric Blake 5 years, 6 months ago

On 5/6/20 4:25 AM, Vladimir Sementsov-Ogievskiy wrote:
> We set bdi->unallocated_blocks_are_zero = iscsilun->lbprz, but
> iscsi_co_block_status doesn't return 0 in case of iscsilun->lbprz, it
> returns ZERO when appropriate. So actually unallocated_blocks_are_zero
> is useless. Drop it now.
> 
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
>   block/iscsi.c | 1 -
>   1 file changed, 1 deletion(-)

This one is easier to justify after removing the 2 clients.  But it's 
simpler than patch 1 in that because block_status never returned 0, this 
has no visible impact to 'qemu-io -c map' or similar, so it doesn't need 
the commit message justification about any change in behavior like patch 
1 needed.

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/block/iscsi.c b/block/iscsi.c
> index a8b76979d8..767e3e75fd 100644
> --- a/block/iscsi.c
> +++ b/block/iscsi.c
> @@ -2163,7 +2163,6 @@ static int coroutine_fn iscsi_co_truncate(BlockDriverState *bs, int64_t offset,
>   static int iscsi_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
>   {
>       IscsiLun *iscsilun = bs->opaque;
> -    bdi->unallocated_blocks_are_zero = iscsilun->lbprz;
>       bdi->cluster_size = iscsilun->cluster_size;
>       return 0;
>   }
> 

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org