aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2016-11-10 14:24:27 +0100
committerKevin Wolf <kwolf@redhat.com>2017-01-09 13:30:52 +0100
commit0f31977d9dd659ae39aa42e3904c5c1b23da1475 (patch)
tree24a3c7573baa297f20deded875bb982cb2175207 /block
parentce15dc08ef13438ba7be75e6887162ad2cc5c6c9 (diff)
downloadqemu-0f31977d9dd659ae39aa42e3904c5c1b23da1475.zip
qemu-0f31977d9dd659ae39aa42e3904c5c1b23da1475.tar.gz
qemu-0f31977d9dd659ae39aa42e3904c5c1b23da1475.tar.bz2
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>
Diffstat (limited to 'block')
-rw-r--r--block/quorum.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/block/quorum.c b/block/quorum.c
index 6a7bd91..e044010 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -144,9 +144,8 @@ static bool quorum_vote(QuorumAIOCB *acb);
static void quorum_aio_finalize(QuorumAIOCB *acb)
{
- acb->has_completed = true;
g_free(acb->qcrs);
- qemu_coroutine_enter_if_inactive(acb->co);
+ g_free(acb);
}
static bool quorum_sha256_compare(QuorumVoteValue *a, QuorumVoteValue *b)
@@ -238,7 +237,8 @@ static void quorum_rewrite_aio_cb(void *opaque, int ret)
return;
}
- quorum_aio_finalize(acb);
+ acb->has_completed = true;
+ qemu_coroutine_enter_if_inactive(acb->co);
}
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;
/* FIXME: rewrite failed children if acb->children_read > 1? */
- quorum_aio_finalize(acb);
+
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 (!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 {
ret = read_fifo_child(acb);
}
- g_free(acb);
+ quorum_aio_finalize(acb);
+
return ret;
}
@@ -757,6 +759,7 @@ static int quorum_co_writev(BlockDriverState *bs,
}
ret = acb->vote_ret;
+ quorum_aio_finalize(acb);
return ret;
}