| Message ID | 1460689866-31020-1-git-send-email-famz@redhat.com |
|---|---|
| State | New |
| Headers | show |
Am 15.04.2016 um 05:11 hat Fam Zheng geschrieben: > qcow2 is not necessarily the top layer node. Since bdrv_inactivate() > doesn't recurse, we should ensure all block nodes are inactivated. > > Signed-off-by: Fam Zheng <famz@redhat.com> Hm, I don't think that's quite right. bdrv_inactivate_all() should be the opposite of bdrv_invalidate_cache_all(), i.e. both operations should affect the same nodes. Currently, both use bdrv_next(), but bdrv_invalidate_cache() is partially recursive: It is called for bs->file (by block.c if there is no implementation for bs, by the driver implementation otherwise), or for all children in the quorum case, but not for other children like bs->backing or the extents for VMDK. If you think that that sounds wrong, I'm with you. :-) The question is how to fix it. I think I'd make bdrv_invalidate() recurse to all children and then do the same for bdrv_inactivate(). Kevin > block.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/block.c b/block.c > index d4939b4..1c575e4 100644 > --- a/block.c > +++ b/block.c > @@ -3270,7 +3270,7 @@ int bdrv_inactivate_all(void) > BlockDriverState *bs = NULL; > int ret; > > - while ((bs = bdrv_next(bs)) != NULL) { > + while ((bs = bdrv_next_node(bs)) != NULL) { > AioContext *aio_context = bdrv_get_aio_context(bs); > > aio_context_acquire(aio_context); > -- > 2.8.0 >
On Fri, 04/15 17:11, Kevin Wolf wrote: > Am 15.04.2016 um 05:11 hat Fam Zheng geschrieben: > > qcow2 is not necessarily the top layer node. Since bdrv_inactivate() > > doesn't recurse, we should ensure all block nodes are inactivated. > > > > Signed-off-by: Fam Zheng <famz@redhat.com> > > Hm, I don't think that's quite right. bdrv_inactivate_all() should be > the opposite of bdrv_invalidate_cache_all(), i.e. both operations should > affect the same nodes. > > Currently, both use bdrv_next(), but bdrv_invalidate_cache() is > partially recursive: It is called for bs->file (by block.c if there is > no implementation for bs, by the driver implementation otherwise), or > for all children in the quorum case, but not for other children like > bs->backing or the extents for VMDK. > > If you think that that sounds wrong, I'm with you. :-) The question is > how to fix it. I think I'd make bdrv_invalidate() recurse to all > children and then do the same for bdrv_inactivate(). That makes sense, I'll try again. Fam > > Kevin > > > block.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/block.c b/block.c > > index d4939b4..1c575e4 100644 > > --- a/block.c > > +++ b/block.c > > @@ -3270,7 +3270,7 @@ int bdrv_inactivate_all(void) > > BlockDriverState *bs = NULL; > > int ret; > > > > - while ((bs = bdrv_next(bs)) != NULL) { > > + while ((bs = bdrv_next_node(bs)) != NULL) { > > AioContext *aio_context = bdrv_get_aio_context(bs); > > > > aio_context_acquire(aio_context); > > -- > > 2.8.0 > >
diff --git a/block.c b/block.c index d4939b4..1c575e4 100644 --- a/block.c +++ b/block.c @@ -3270,7 +3270,7 @@ int bdrv_inactivate_all(void) BlockDriverState *bs = NULL; int ret; - while ((bs = bdrv_next(bs)) != NULL) { + while ((bs = bdrv_next_node(bs)) != NULL) { AioContext *aio_context = bdrv_get_aio_context(bs); aio_context_acquire(aio_context);
qcow2 is not necessarily the top layer node. Since bdrv_inactivate() doesn't recurse, we should ensure all block nodes are inactivated. Signed-off-by: Fam Zheng <famz@redhat.com> --- block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)