Skip to content

Commit

Permalink
commit: Use bdrv_append() in commit_start()
Browse files Browse the repository at this point in the history
This function combines bdrv_set_backing_hd() and bdrv_replace_node()
so we can use it to simplify the code a bit in commit_start().

Signed-off-by: Alberto Garcia <berto@igalia.com>
Message-id: 20190403143748.9790-1-berto@igalia.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
  • Loading branch information
bertogg authored and XanClic committed May 7, 2019
1 parent 0b3ca76 commit 6a63419
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions block/commit.c
Expand Up @@ -303,23 +303,14 @@ void commit_start(const char *job_id, BlockDriverState *bs,
commit_top_bs->total_sectors = top->total_sectors;
bdrv_set_aio_context(commit_top_bs, bdrv_get_aio_context(top));

bdrv_set_backing_hd(commit_top_bs, top, &local_err);
bdrv_append(commit_top_bs, top, &local_err);
if (local_err) {
bdrv_unref(commit_top_bs);
commit_top_bs = NULL;
error_propagate(errp, local_err);
goto fail;
}
bdrv_replace_node(top, commit_top_bs, &local_err);
if (local_err) {
bdrv_unref(commit_top_bs);
commit_top_bs = NULL;
error_propagate(errp, local_err);
goto fail;
}

s->commit_top_bs = commit_top_bs;
bdrv_unref(commit_top_bs);

/* Block all nodes between top and base, because they will
* disappear from the chain after this operation. */
Expand Down

0 comments on commit 6a63419

Please sign in to comment.