Commit 7940e505 authored by Fam Zheng's avatar Fam Zheng Committed by Stefan Hajnoczi
Browse files

quorum: Convert quorum_aiocb_info.cancel to .cancel_async 



Before, we cancel all the child requests with bdrv_aio_cancel, then free
the acb..

Now we just kick off asynchronous cancellation of child requests and
return, we know quorum_aio_cb will be called later, so in the end
quorum_aio_finalize will take care of calling the caller's cb.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 997dd8df

block/quorum.c

+2 −5
Original line number Diff line number Diff line
@@ -139,17 +139,14 @@ static void quorum_aio_cancel(BlockDriverAIOCB *blockacb) 
    /* cancel all callbacks */

    for (i = 0; i < s->num_children; i++) {

        if (acb->qcrs[i].aiocb) {

            bdrv_aio_cancel(acb->qcrs[i].aiocb);

            bdrv_aio_cancel_async(acb->qcrs[i].aiocb);

        }

    }



    g_free(acb->qcrs);

    qemu_aio_release(acb);

}



static AIOCBInfo quorum_aiocb_info = {

    .aiocb_size         = sizeof(QuorumAIOCB),

    .cancel             = quorum_aio_cancel,

    .cancel_async       = quorum_aio_cancel,

};



static void quorum_aio_finalize(QuorumAIOCB *acb)