ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

quorum: Do cleanup in caller coroutine 

Instead of calling quorum_aio_finalize() deeply nested in what used
to be an AIO callback, do it in the same functions that allocated the
AIOCB.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Kevin Wolf 2016-11-10 14:24:27 +01:00
parent ce15dc08ef
commit 0f31977d9d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
block/quorum.c
View File

@ -144,9 +144,8 @@ static bool quorum_vote(QuorumAIOCB *acb);
static void quorum_aio_finalize(QuorumAIOCB *acb) static void quorum_aio_finalize(QuorumAIOCB *acb)
{ {
acb->has_completed = true;
g_free(acb->qcrs); g_free(acb->qcrs);
qemu_coroutine_enter_if_inactive(acb->co); g_free(acb);
} }
static bool quorum_sha256_compare(QuorumVoteValue *a, QuorumVoteValue *b) static bool quorum_sha256_compare(QuorumVoteValue *a, QuorumVoteValue *b)
@ -238,7 +237,8 @@ static void quorum_rewrite_aio_cb(void *opaque, int ret)
return; return;
} }
quorum_aio_finalize(acb); acb->has_completed = true;
qemu_coroutine_enter_if_inactive(acb->co);
} }
static int read_fifo_child(QuorumAIOCB *acb); static int read_fifo_child(QuorumAIOCB *acb);
@ -284,7 +284,7 @@ static int quorum_fifo_aio_cb(void *opaque, int ret)
acb->vote_ret = ret; acb->vote_ret = ret;
/* FIXME: rewrite failed children if acb->children_read > 1? */ /* FIXME: rewrite failed children if acb->children_read > 1? */
quorum_aio_finalize(acb);
return ret; return ret;
} }
@ -322,7 +322,8 @@ static void quorum_aio_cb(void *opaque, int ret)
/* if no rewrite is done the code will finish right away */ /* if no rewrite is done the code will finish right away */
if (!rewrite) { if (!rewrite) {
quorum_aio_finalize(acb); acb->has_completed = true;
qemu_coroutine_enter_if_inactive(acb->co);
} }
} }
@ -715,7 +716,8 @@ static int quorum_co_readv(BlockDriverState *bs,
} else { } else {
ret = read_fifo_child(acb); ret = read_fifo_child(acb);
} }
g_free(acb); quorum_aio_finalize(acb);
return ret; return ret;
} }
@ -757,6 +759,7 @@ static int quorum_co_writev(BlockDriverState *bs,
} }
ret = acb->vote_ret; ret = acb->vote_ret;
quorum_aio_finalize(acb);
return ret; return ret;
} }