[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/6] sheepdog: traverse pending_list from the first
From: |
MORITA Kazutaka |
Subject: |
[Qemu-devel] [PATCH 6/6] sheepdog: traverse pending_list from the first for each time |
Date: |
Wed, 27 Jun 2012 07:26:23 +0900 |
The pending list can be modified in other coroutine context
sd_co_rw_vector, so we need to traverse the list from the first again
after we send the pending request.
Signed-off-by: MORITA Kazutaka <address@hidden>
---
block/sheepdog.c | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/block/sheepdog.c b/block/sheepdog.c
index f6cd517..6e73efb 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -634,21 +634,31 @@ static int coroutine_fn add_aio_request(BDRVSheepdogState
*s, AIOReq *aio_req,
struct iovec *iov, int niov, int create,
enum AIOCBState aiocb_type);
+
+static AIOReq *find_pending_req(BDRVSheepdogState *s, uint64_t oid)
+{
+ AIOReq *aio_req;
+
+ QLIST_FOREACH(aio_req, &s->pending_aio_head, aio_siblings) {
+ if (aio_req->oid == oid) {
+ return aio_req;
+ }
+ }
+
+ return NULL;
+}
+
/*
* This function searchs pending requests to the object `oid', and
* sends them.
*/
static void coroutine_fn send_pending_req(BDRVSheepdogState *s, uint64_t oid)
{
- AIOReq *aio_req, *next;
+ AIOReq *aio_req;
SheepdogAIOCB *acb;
int ret;
- QLIST_FOREACH_SAFE(aio_req, &s->pending_aio_head, aio_siblings, next) {
- if (aio_req->oid != oid) {
- continue;
- }
-
+ while ((aio_req = find_pending_req(s, oid)) != NULL) {
acb = aio_req->aiocb;
/* move aio_req from pending list to inflight one */
QLIST_REMOVE(aio_req, aio_siblings);
--
1.7.2.5
- [Qemu-devel] [PATCH 0/6] sheepdog: various fixes, MORITA Kazutaka, 2012/06/26
- [Qemu-devel] [PATCH 1/6] sheepdog: fix dprintf format strings, MORITA Kazutaka, 2012/06/26
- [Qemu-devel] [PATCH 5/6] sheepdog: split outstanding list into inflight and pending, MORITA Kazutaka, 2012/06/26
- [Qemu-devel] [PATCH 4/6] sheepdog: make sure we don't free aiocb before sending all requests, MORITA Kazutaka, 2012/06/26
- [Qemu-devel] [PATCH 2/6] sheepdog: restart I/O when socket becomes ready in do_co_req(), MORITA Kazutaka, 2012/06/26
- [Qemu-devel] [PATCH 3/6] sheepdog: use coroutine based socket functions in coroutine context, MORITA Kazutaka, 2012/06/26
- [Qemu-devel] [PATCH 6/6] sheepdog: traverse pending_list from the first for each time,
MORITA Kazutaka <=