diff options
| author | Stefan Reiter <s.reiter@proxmox.com> | 2020-04-07 13:56:50 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2020-04-07 14:34:47 +0200 |
| commit | 08558e33257ec796594bd411261028a93414a70c (patch) | |
| tree | 9a0956ea93cb9bbab75832fffc3a1f14c4c29662 /block | |
| parent | b660a84bbb0eb1a76b505648d31d5e82594fb75e (diff) | |
replication: assert we own context before job_cancel_sync
job_cancel_sync requires the job's lock to be held, all other callers
already do this (replication_stop, drive_backup_abort,
blockdev_backup_abort, job_cancel_sync_all, cancel_common).
In this case we're in a BlockDriver handler, so we already have a lock,
just assert that it is the same as the one used for the commit_job.
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
Message-Id: <20200407115651.69472-3-s.reiter@proxmox.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/replication.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/block/replication.c b/block/replication.c index 413d95407d..da013c2041 100644 --- a/block/replication.c +++ b/block/replication.c @@ -144,12 +144,15 @@ fail: static void replication_close(BlockDriverState *bs) { BDRVReplicationState *s = bs->opaque; + Job *commit_job; if (s->stage == BLOCK_REPLICATION_RUNNING) { replication_stop(s->rs, false, NULL); } if (s->stage == BLOCK_REPLICATION_FAILOVER) { - job_cancel_sync(&s->commit_job->job); + commit_job = &s->commit_job->job; + assert(commit_job->aio_context == qemu_get_current_aio_context()); + job_cancel_sync(commit_job); } if (s->mode == REPLICATION_MODE_SECONDARY) { |