Commit 08558e33 authored by Stefan Reiter's avatar Stefan Reiter Committed by Kevin Wolf
Browse files

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: default avatarStefan Reiter <s.reiter@proxmox.com>
Message-Id: <20200407115651.69472-3-s.reiter@proxmox.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent b660a84b

block/replication.c

+4 −1
Original line number Diff line number Diff line
@@ -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) {