[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 16/18] quorum: split quorum_fifo_aio_cb from quorum_
From: |
Paolo Bonzini |
Subject: |
[Qemu-block] [PATCH 16/18] quorum: split quorum_fifo_aio_cb from quorum_aio_cb |
Date: |
Thu, 6 Aug 2015 15:36:14 +0200 |
The two cases of quorum_aio_cb are called from different paths, clarify
that with an assertion. Also note that the FIFO read pattern is not
doing rewrites.
Signed-off-by: Paolo Bonzini <address@hidden>
---
block/quorum.c | 37 +++++++++++++++++++++++--------------
1 file changed, 23 insertions(+), 14 deletions(-)
diff --git a/block/quorum.c b/block/quorum.c
index 0a42962..026528e 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -271,28 +271,37 @@ static void quorum_copy_qiov(QEMUIOVector *dest,
QEMUIOVector *source)
}
}
-static void quorum_aio_cb(void *opaque, int ret)
+static void quorum_fifo_aio_cb(void *opaque, int ret)
{
QuorumChildRequest *sacb = opaque;
QuorumAIOCB *acb = sacb->parent;
BDRVQuorumState *s = acb->common.bs->opaque;
- bool rewrite = false;
- if (acb->is_read && s->read_pattern == QUORUM_READ_PATTERN_FIFO) {
- /* We try to read next child in FIFO order if we fail to read */
- if (ret < 0 && ++acb->child_iter < s->num_children) {
- read_fifo_child(acb);
- return;
- }
+ assert(acb->is_read && s->read_pattern == QUORUM_READ_PATTERN_FIFO);
- if (ret == 0) {
- quorum_copy_qiov(acb->qiov, &acb->qcrs[acb->child_iter].qiov);
- }
- acb->vote_ret = ret;
- quorum_aio_finalize(acb);
+ /* We try to read next child in FIFO order if we fail to read */
+ if (ret < 0 && ++acb->child_iter < s->num_children) {
+ read_fifo_child(acb);
return;
}
+ if (ret == 0) {
+ quorum_copy_qiov(acb->qiov, &acb->qcrs[acb->child_iter].qiov);
+ }
+ acb->vote_ret = ret;
+
+ /* FIXME: rewrite failed children if acb->child_iter > 0? */
+
+ quorum_aio_finalize(acb);
+}
+
+static void quorum_aio_cb(void *opaque, int ret)
+{
+ QuorumChildRequest *sacb = opaque;
+ QuorumAIOCB *acb = sacb->parent;
+ BDRVQuorumState *s = acb->common.bs->opaque;
+ bool rewrite = false;
+
sacb->ret = ret;
acb->count++;
if (ret == 0) {
@@ -658,7 +667,7 @@ static BlockAIOCB *read_fifo_child(QuorumAIOCB *acb)
acb->qcrs[acb->child_iter].buf);
bdrv_aio_readv(s->bs[acb->child_iter], acb->sector_num,
&acb->qcrs[acb->child_iter].qiov, acb->nb_sectors,
- quorum_aio_cb, &acb->qcrs[acb->child_iter]);
+ quorum_fifo_aio_cb, &acb->qcrs[acb->child_iter]);
return &acb->common;
}
--
2.4.3
- [Qemu-block] [RFC PATCH 00/18] Fine-grained AioContext critical sections, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 02/18] aio: rename bh_lock to list_lock, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 03/18] qemu-thread: introduce QemuLockCnt, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 04/18] aio: make ctx->list_lock a QemuLockCnt, subsuming ctx->walking_bh, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 06/18] aio-posix: remove walking_handlers, protecting AioHandler list with list_lock, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 09/18] aio: push aio_context_acquire/release down to dispatching, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 10/18] async: optimize aio_bh_poll, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 16/18] quorum: split quorum_fifo_aio_cb from quorum_aio_cb,
Paolo Bonzini <=
- [Qemu-block] [PATCH 05/18] aio: tweak walking in dispatch phase, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 08/18] aio: document locking, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 14/18] block: explicitly acquire aiocontext in timers that need it, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 01/18] iothread: release iothread around aio_poll, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 15/18] quorum: use atomics for rewrite_count, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 07/18] aio-win32: remove walking_handlers, protecting AioHandler list with list_lock, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 18/18] aio: update locking documentation, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 12/18] block: explicitly acquire aiocontext in callbacks that need it, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 17/18] block: explicitly acquire aiocontext in aio callbacks that need it, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 13/18] block: explicitly acquire aiocontext in bottom halves that need it, Paolo Bonzini, 2015/08/06