diff options
author | Kevin Wolf <kwolf@redhat.com> | 2016-11-10 17:40:34 +0100 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2017-01-09 13:30:52 +0100 |
commit | a7e159025ed439011a47d56af5f34729bbb7247c (patch) | |
tree | 9316c204fd846d731bb0df439781816c0672fc2c /block/quorum.c | |
parent | 6847da380805c46e21162dac3e4b4123399769d0 (diff) | |
download | qemu-a7e159025ed439011a47d56af5f34729bbb7247c.zip qemu-a7e159025ed439011a47d56af5f34729bbb7247c.tar.gz qemu-a7e159025ed439011a47d56af5f34729bbb7247c.tar.bz2 |
quorum: Inline quorum_fifo_aio_cb()
Inlining the function removes some boilerplace code and replaces
recursion by a simple loop, so the code becomes somewhat easier to
understand.
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/quorum.c')
-rw-r--r-- | block/quorum.c | 42 |
1 files changed, 13 insertions, 29 deletions
diff --git a/block/quorum.c b/block/quorum.c index 4bba9fd..e244389 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -250,30 +250,6 @@ static void quorum_report_bad_acb(QuorumChildRequest *sacb, int ret) quorum_report_bad(type, acb->offset, acb->bytes, sacb->bs->node_name, ret); } -static int quorum_fifo_aio_cb(void *opaque, int ret) -{ - QuorumChildRequest *sacb = opaque; - QuorumAIOCB *acb = sacb->parent; - BDRVQuorumState *s = acb->bs->opaque; - - assert(acb->is_read && s->read_pattern == QUORUM_READ_PATTERN_FIFO); - - if (ret < 0) { - quorum_report_bad_acb(sacb, ret); - - /* We try to read next child in FIFO order if we fail to read */ - if (acb->children_read < s->num_children) { - return read_fifo_child(acb); - } - } - - acb->vote_ret = ret; - - /* FIXME: rewrite failed children if acb->children_read > 1? */ - - return ret; -} - static void quorum_report_bad_versions(BDRVQuorumState *s, QuorumAIOCB *acb, QuorumVoteValue *value) @@ -679,12 +655,20 @@ static int read_quorum_children(QuorumAIOCB *acb) static int read_fifo_child(QuorumAIOCB *acb) { BDRVQuorumState *s = acb->bs->opaque; - int n = acb->children_read++; - int ret; + int n, ret; + + /* We try to read the next child in FIFO order if we failed to read */ + do { + n = acb->children_read++; + acb->qcrs[n].bs = s->children[n]->bs; + ret = bdrv_co_preadv(s->children[n], acb->offset, acb->bytes, + acb->qiov, 0); + if (ret < 0) { + quorum_report_bad_acb(&acb->qcrs[n], ret); + } + } while (ret < 0 && acb->children_read < s->num_children); - acb->qcrs[n].bs = s->children[n]->bs; - ret = bdrv_co_preadv(s->children[n], acb->offset, acb->bytes, acb->qiov, 0); - ret = quorum_fifo_aio_cb(&acb->qcrs[n], ret); + /* FIXME: rewrite failed children if acb->children_read > 1? */ return ret; } |