summary refs log tree commit diff stats
path: root/block/commit.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2018-04-24 16:13:52 +0200
committerKevin Wolf <kwolf@redhat.com>2018-05-23 14:30:51 +0200
commit3d70ff53b6bf90d9eec6f97024ec9895f6799d9e (patch)
tree947adf7d4422c78235ff4b8f2a31fac0085efc9a /block/commit.c
parent7eaa8fb57da96301f4a8ce176ad503f80efc7cc0 (diff)
downloadfocaccia-qemu-3d70ff53b6bf90d9eec6f97024ec9895f6799d9e.tar.gz
focaccia-qemu-3d70ff53b6bf90d9eec6f97024ec9895f6799d9e.zip
job: Move completion and cancellation to Job
This moves the top-level job completion and cancellation functions from
BlockJob to Job.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/commit.c')
-rw-r--r--block/commit.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/block/commit.c b/block/commit.c
index 40d97a35a5..b0a847e678 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -112,12 +112,12 @@ static void commit_complete(Job *job, void *opaque)
     blk_unref(s->top);
 
     /* If there is more than one reference to the job (e.g. if called from
-     * job_finish_sync()), block_job_completed() won't free it and therefore
-     * the blockers on the intermediate nodes remain. This would cause
+     * job_finish_sync()), job_completed() won't free it and therefore the
+     * blockers on the intermediate nodes remain. This would cause
      * bdrv_set_backing_hd() to fail. */
     block_job_remove_all_bdrv(bjob);
 
-    block_job_completed(&s->common, ret);
+    job_completed(job, ret);
     g_free(data);
 
     /* If bdrv_drop_intermediate() didn't already do that, remove the commit