| Message ID | 20171220103412.13048-19-kwolf@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 12/20 11:34, Kevin Wolf wrote: > Since commit bde70715, base is the only node that is reopened in > commit_start(). This means that the code, which still involves an > explicit BlockReopenQueue, can now be simplified by using bdrv_reopen(). > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > block/commit.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/block/commit.c b/block/commit.c > index c5327551ce..bb6c904704 100644 > --- a/block/commit.c > +++ b/block/commit.c > @@ -277,7 +277,6 @@ void commit_start(const char *job_id, BlockDriverState *bs, > const char *filter_node_name, Error **errp) > { > CommitBlockJob *s; > - BlockReopenQueue *reopen_queue = NULL; > int orig_base_flags; > BlockDriverState *iter; > BlockDriverState *commit_top_bs = NULL; > @@ -299,12 +298,7 @@ void commit_start(const char *job_id, BlockDriverState *bs, > /* convert base to r/w, if necessary */ > orig_base_flags = bdrv_get_flags(base); > if (!(orig_base_flags & BDRV_O_RDWR)) { > - reopen_queue = bdrv_reopen_queue(reopen_queue, base, NULL, > - orig_base_flags | BDRV_O_RDWR); > - } > - > - if (reopen_queue) { > - bdrv_reopen_multiple(bdrv_get_aio_context(bs), reopen_queue, &local_err); > + bdrv_reopen(base, orig_base_flags | BDRV_O_RDWR, &local_err); > if (local_err != NULL) { > error_propagate(errp, local_err); > goto fail; > -- > 2.13.6 > Reviewed-by: Fam Zheng <famz@redhat.com>
diff --git a/block/commit.c b/block/commit.c index c5327551ce..bb6c904704 100644 --- a/block/commit.c +++ b/block/commit.c @@ -277,7 +277,6 @@ void commit_start(const char *job_id, BlockDriverState *bs, const char *filter_node_name, Error **errp) { CommitBlockJob *s; - BlockReopenQueue *reopen_queue = NULL; int orig_base_flags; BlockDriverState *iter; BlockDriverState *commit_top_bs = NULL; @@ -299,12 +298,7 @@ void commit_start(const char *job_id, BlockDriverState *bs, /* convert base to r/w, if necessary */ orig_base_flags = bdrv_get_flags(base); if (!(orig_base_flags & BDRV_O_RDWR)) { - reopen_queue = bdrv_reopen_queue(reopen_queue, base, NULL, - orig_base_flags | BDRV_O_RDWR); - } - - if (reopen_queue) { - bdrv_reopen_multiple(bdrv_get_aio_context(bs), reopen_queue, &local_err); + bdrv_reopen(base, orig_base_flags | BDRV_O_RDWR, &local_err); if (local_err != NULL) { error_propagate(errp, local_err); goto fail;
Since commit bde70715, base is the only node that is reopened in commit_start(). This means that the code, which still involves an explicit BlockReopenQueue, can now be simplified by using bdrv_reopen(). Signed-off-by: Kevin Wolf <kwolf@redhat.com> --- block/commit.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)