diff options
| author | Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | 2021-02-02 15:49:48 +0300 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2021-03-08 15:14:14 -0600 |
| commit | eb5becc18fff6ba43922a169a64029e7e26ef86a (patch) | |
| tree | aaa00902a54e77200473b3cdc6f4b84ae29286ff | |
| parent | dc9c10a1f42235a7f8411feca28984c4e7da3177 (diff) | |
| download | focaccia-qemu-eb5becc18fff6ba43922a169a64029e7e26ef86a.tar.gz focaccia-qemu-eb5becc18fff6ba43922a169a64029e7e26ef86a.zip | |
block/mirror: drop extra error propagation in commit_active_start()
Let's check return value of mirror_start_job to check for failure instead of local_err. Rename ret to job, as ret is usually integer variable. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Greg Kurz <groug@kaod.org> Reviewed-by: Alberto Garcia <berto@igalia.com> Message-Id: <20210202124956.63146-7-vsementsov@virtuozzo.com> Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | block/mirror.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/block/mirror.c b/block/mirror.c index 1803c6988b..6af02a57c4 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1860,8 +1860,7 @@ BlockJob *commit_active_start(const char *job_id, BlockDriverState *bs, bool auto_complete, Error **errp) { bool base_read_only; - Error *local_err = NULL; - BlockJob *ret; + BlockJob *job; base_read_only = bdrv_is_read_only(base); @@ -1871,19 +1870,18 @@ BlockJob *commit_active_start(const char *job_id, BlockDriverState *bs, } } - ret = mirror_start_job( + job = mirror_start_job( job_id, bs, creation_flags, base, NULL, speed, 0, 0, MIRROR_LEAVE_BACKING_CHAIN, false, on_error, on_error, true, cb, opaque, &commit_active_job_driver, false, base, auto_complete, filter_node_name, false, MIRROR_COPY_MODE_BACKGROUND, - &local_err); - if (local_err) { - error_propagate(errp, local_err); + errp); + if (!job) { goto error_restore_flags; } - return ret; + return job; error_restore_flags: /* ignore error and errp for bdrv_reopen, because we want to propagate |