[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 16/22] quorum: Convert quorum_aiocb_info.cancel t
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v5 16/22] quorum: Convert quorum_aiocb_info.cancel to .cancel_async |
Date: |
Wed, 10 Sep 2014 14:00:08 +0800 |
Before, we cancel all the child requests with bdrv_aio_cancel, then free
the acb..
Now we just kick off asynchronous cancellation of child requests and
return, we know quorum_aio_cb will be called later, so in the end
quorum_aio_finalize will take care of calling the caller's cb.
Signed-off-by: Fam Zheng <address@hidden>
---
block/quorum.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/block/quorum.c b/block/quorum.c
index 41c4249..f343c04 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -139,17 +139,14 @@ static void quorum_aio_cancel(BlockDriverAIOCB *blockacb)
/* cancel all callbacks */
for (i = 0; i < s->num_children; i++) {
if (acb->qcrs[i].aiocb) {
- bdrv_aio_cancel(acb->qcrs[i].aiocb);
+ bdrv_aio_cancel_async(acb->qcrs[i].aiocb);
}
}
-
- g_free(acb->qcrs);
- qemu_aio_release(acb);
}
static AIOCBInfo quorum_aiocb_info = {
.aiocb_size = sizeof(QuorumAIOCB),
- .cancel = quorum_aio_cancel,
+ .cancel_async = quorum_aio_cancel,
};
static void quorum_aio_finalize(QuorumAIOCB *acb)
--
1.9.3
- Re: [Qemu-devel] [PATCH v5 05/22] block: Convert bdrv_em_aiocb_info.cancel to .cancel_async, (continued)
- [Qemu-devel] [PATCH v5 06/22] thread-pool: Convert thread_pool_aiocb_info.cancel to cancel_async, Fam Zheng, 2014/09/10
- [Qemu-devel] [PATCH v5 07/22] linux-aio: Convert laio_aiocb_info.cancel to .cancel_async, Fam Zheng, 2014/09/10
- [Qemu-devel] [PATCH v5 08/22] dma: Convert dma_aiocb_info.cancel to .cancel_async, Fam Zheng, 2014/09/10
- [Qemu-devel] [PATCH v5 09/22] iscsi: Convert iscsi_aiocb_info.cancel to .cancel_async, Fam Zheng, 2014/09/10
- [Qemu-devel] [PATCH v5 10/22] archipelago: Drop archipelago_aiocb_info.cancel, Fam Zheng, 2014/09/10
- [Qemu-devel] [PATCH v5 11/22] blkdebug: Drop blkdebug_aiocb_info.cancel, Fam Zheng, 2014/09/10
- [Qemu-devel] [PATCH v5 13/22] curl: Drop curl_aiocb_info.cancel, Fam Zheng, 2014/09/10
- [Qemu-devel] [PATCH v5 14/22] qed: Drop qed_aiocb_info.cancel, Fam Zheng, 2014/09/10
- [Qemu-devel] [PATCH v5 15/22] quorum: fix quorum_aio_cancel(), Fam Zheng, 2014/09/10
- [Qemu-devel] [PATCH v5 16/22] quorum: Convert quorum_aiocb_info.cancel to .cancel_async,
Fam Zheng <=
- [Qemu-devel] [PATCH v5 17/22] rbd: Drop rbd_aiocb_info.cancel, Fam Zheng, 2014/09/10
- [Qemu-devel] [PATCH v5 18/22] sheepdog: Convert sd_aiocb_info.cancel to .cancel_async, Fam Zheng, 2014/09/10
- [Qemu-devel] [PATCH v5 19/22] win32-aio: Drop win32_aiocb_info.cancel, Fam Zheng, 2014/09/10
- [Qemu-devel] [PATCH v5 20/22] ide: Convert trim_aiocb_info.cancel to .cancel_async, Fam Zheng, 2014/09/10
- [Qemu-devel] [PATCH v5 21/22] block: Drop AIOCBInfo.cancel, Fam Zheng, 2014/09/10
- [Qemu-devel] [PATCH v5 22/22] block: Rename qemu_aio_release -> qemu_aio_unref, Fam Zheng, 2014/09/10
- [Qemu-devel] [PATCH v5 12/22] blkverify: Drop blkverify_aiocb_info.cancel, Fam Zheng, 2014/09/10
- Re: [Qemu-devel] [PATCH v5 00/22] block: Asynchronous request cancellation, Bin Wu, 2014/09/10