Commit 4fb588e9 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Jeff Cody
Browse files

blockjob: reorganize block_job_completed_txn_abort 



This splits the part that touches job states from the part that invokes
callbacks.  It will make the code simpler to understand once job states will
be protected by a different mutex than the AioContext lock.

Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-id: 20170508141310.8674-11-pbonzini@redhat.com
Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
parent 7e74a734

blockjob.c

+22 −13
Original line number Diff line number Diff line
@@ -300,6 +300,8 @@ void block_job_start(BlockJob *job) 


static void block_job_completed_single(BlockJob *job)

{

    assert(job->completed);



    if (!job->ret) {

        if (job->driver->commit) {

            job->driver->commit(job);
@@ -361,7 +363,9 @@ static int block_job_finish_sync(BlockJob *job, 


    block_job_ref(job);



    if (finish) {

        finish(job, &local_err);

    }

    if (local_err) {

        error_propagate(errp, local_err);

        block_job_unref(job);
@@ -385,7 +389,7 @@ static void block_job_completed_txn_abort(BlockJob *job) 
{

    AioContext *ctx;

    BlockJobTxn *txn = job->txn;

    BlockJob *other_job, *next;

    BlockJob *other_job;



    if (txn->aborting) {

        /*
@@ -394,29 +398,34 @@ static void block_job_completed_txn_abort(BlockJob *job) 
        return;

    }

    txn->aborting = true;

    block_job_txn_ref(txn);



    /* We are the first failed job. Cancel other jobs. */

    QLIST_FOREACH(other_job, &txn->jobs, txn_list) {

        ctx = blk_get_aio_context(other_job->blk);

        aio_context_acquire(ctx);

    }

    QLIST_FOREACH(other_job, &txn->jobs, txn_list) {

        if (other_job == job || other_job->completed) {

            /* Other jobs are "effectively" cancelled by us, set the status for



    /* Other jobs are effectively cancelled by us, set the status for

     * them; this job, however, may or may not be cancelled, depending

     * on the caller, so leave it. */

    QLIST_FOREACH(other_job, &txn->jobs, txn_list) {

        if (other_job != job) {

            block_job_cancel_async(other_job);

        }

            continue;

        }

        block_job_cancel_sync(other_job);

        assert(other_job->completed);

    }

    QLIST_FOREACH_SAFE(other_job, &txn->jobs, txn_list, next) {

    while (!QLIST_EMPTY(&txn->jobs)) {

        other_job = QLIST_FIRST(&txn->jobs);

        ctx = blk_get_aio_context(other_job->blk);

        if (!other_job->completed) {

            assert(other_job->cancelled);

            block_job_finish_sync(other_job, NULL, NULL);

        }

        block_job_completed_single(other_job);

        aio_context_release(ctx);

    }



    block_job_txn_unref(txn);

}



static void block_job_completed_txn_success(BlockJob *job)