Message ID | 20200625152215.941773-4-mreitz@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | block: Deal with filters | expand |
On 25.06.2020 18:21, Max Reitz wrote: > bdrv_has_zero_init() and the related bdrv_unallocated_blocks_are_zero() > should use bdrv_cow_child() if they want to check whether the given BDS > has a COW backing file. > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > block.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/block.c b/block.c > index 0a0b855261..f3e2aae49c 100644 > --- a/block.c > +++ b/block.c > @@ -5394,7 +5394,7 @@ int bdrv_has_zero_init(BlockDriverState *bs) > > /* If BS is a copy on write image, it is initialized to > the contents of the base image, which may not be zeroes. */ > - if (bs->backing) { > + if (bdrv_cow_child(bs)) { > return 0; > } > if (bs->drv->bdrv_has_zero_init) { > @@ -5412,7 +5412,7 @@ bool bdrv_unallocated_blocks_are_zero(BlockDriverState *bs) > { > BlockDriverInfo bdi; > > - if (bs->backing) { > + if (bdrv_cow_child(bs)) { > return false; > } > Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
25.06.2020 18:21, Max Reitz wrote: > bdrv_has_zero_init() and the related bdrv_unallocated_blocks_are_zero() > should use bdrv_cow_child() if they want to check whether the given BDS > has a COW backing file. > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > block.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/block.c b/block.c > index 0a0b855261..f3e2aae49c 100644 > --- a/block.c > +++ b/block.c > @@ -5394,7 +5394,7 @@ int bdrv_has_zero_init(BlockDriverState *bs) > > /* If BS is a copy on write image, it is initialized to > the contents of the base image, which may not be zeroes. */ > - if (bs->backing) { > + if (bdrv_cow_child(bs)) { > return 0; > } > if (bs->drv->bdrv_has_zero_init) { > @@ -5412,7 +5412,7 @@ bool bdrv_unallocated_blocks_are_zero(BlockDriverState *bs) the function is removed, so, this chunk should be dropped or rebased.. > { > BlockDriverInfo bdi; > > - if (bs->backing) { > + if (bdrv_cow_child(bs)) { > return false; > } > >
diff --git a/block.c b/block.c index 0a0b855261..f3e2aae49c 100644 --- a/block.c +++ b/block.c @@ -5394,7 +5394,7 @@ int bdrv_has_zero_init(BlockDriverState *bs) /* If BS is a copy on write image, it is initialized to the contents of the base image, which may not be zeroes. */ - if (bs->backing) { + if (bdrv_cow_child(bs)) { return 0; } if (bs->drv->bdrv_has_zero_init) { @@ -5412,7 +5412,7 @@ bool bdrv_unallocated_blocks_are_zero(BlockDriverState *bs) { BlockDriverInfo bdi; - if (bs->backing) { + if (bdrv_cow_child(bs)) { return false; }
bdrv_has_zero_init() and the related bdrv_unallocated_blocks_are_zero() should use bdrv_cow_child() if they want to check whether the given BDS has a COW backing file. Signed-off-by: Max Reitz <mreitz@redhat.com> --- block.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)