| Message ID | 1461706338-20219-2-git-send-email-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 04/26/2016 03:32 PM, Max Reitz wrote: > bdrv_refresh_filename() should invoke itself recursively on all > children, not just on file. > > With that change, we can remove the manual invocations in blkverify and > quorum. > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > block.c | 9 +++++---- > block/blkverify.c | 3 --- > block/quorum.c | 1 - > 3 files changed, 5 insertions(+), 8 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com>
On Tue 26 Apr 2016 11:32:00 PM CEST, Max Reitz wrote: > bdrv_refresh_filename() should invoke itself recursively on all > children, not just on file. > > With that change, we can remove the manual invocations in blkverify and > quorum. > > Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Alberto Garcia <berto@igalia.com> Berto
diff --git a/block.c b/block.c index d4939b4..e349e83 100644 --- a/block.c +++ b/block.c @@ -3885,16 +3885,17 @@ static bool append_open_options(QDict *d, BlockDriverState *bs) void bdrv_refresh_filename(BlockDriverState *bs) { BlockDriver *drv = bs->drv; + BdrvChild *child; QDict *opts; if (!drv) { return; } - /* This BDS's file name will most probably depend on its file's name, so - * refresh that first */ - if (bs->file) { - bdrv_refresh_filename(bs->file->bs); + /* This BDS's file name may depend on any of its children's file names, so + * refresh those first */ + QLIST_FOREACH(child, &bs->children, next) { + bdrv_refresh_filename(child->bs); } if (drv->bdrv_refresh_filename) { diff --git a/block/blkverify.c b/block/blkverify.c index 9414b7a..f445e3e 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -313,9 +313,6 @@ static void blkverify_refresh_filename(BlockDriverState *bs, QDict *options) { BDRVBlkverifyState *s = bs->opaque; - /* bs->file->bs has already been refreshed */ - bdrv_refresh_filename(s->test_file->bs); - if (bs->file->bs->full_open_options && s->test_file->bs->full_open_options) { diff --git a/block/quorum.c b/block/quorum.c index da15465..98c6588 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -1028,7 +1028,6 @@ static void quorum_refresh_filename(BlockDriverState *bs, QDict *options) int i; for (i = 0; i < s->num_children; i++) { - bdrv_refresh_filename(s->children[i]->bs); if (!s->children[i]->bs->full_open_options) { return; }
bdrv_refresh_filename() should invoke itself recursively on all children, not just on file. With that change, we can remove the manual invocations in blkverify and quorum. Signed-off-by: Max Reitz <mreitz@redhat.com> --- block.c | 9 +++++---- block/blkverify.c | 3 --- block/quorum.c | 1 - 3 files changed, 5 insertions(+), 8 deletions(-)