[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 10/22] archipelago: Drop archipelago_aiocb_info.c
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v5 10/22] archipelago: Drop archipelago_aiocb_info.cancel |
Date: |
Wed, 10 Sep 2014 14:00:02 +0800 |
The cancelled flag is no longer useful. Later the request will complete
as before, and cb will be called.
Signed-off-by: Fam Zheng <address@hidden>
---
block/archipelago.c | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/block/archipelago.c b/block/archipelago.c
index 22a7daa..1fa0462 100644
--- a/block/archipelago.c
+++ b/block/archipelago.c
@@ -92,7 +92,6 @@ typedef struct ArchipelagoAIOCB {
struct BDRVArchipelagoState *s;
QEMUIOVector *qiov;
ARCHIPCmd cmd;
- bool cancelled;
int status;
int64_t size;
int64_t ret;
@@ -318,9 +317,7 @@ static void qemu_archipelago_complete_aio(void *opaque)
aio_cb->common.cb(aio_cb->common.opaque, aio_cb->ret);
aio_cb->status = 0;
- if (!aio_cb->cancelled) {
- qemu_aio_release(aio_cb);
- }
+ qemu_aio_release(aio_cb);
g_free(reqdata);
}
@@ -724,19 +721,8 @@ static int qemu_archipelago_create(const char *filename,
return ret;
}
-static void qemu_archipelago_aio_cancel(BlockDriverAIOCB *blockacb)
-{
- ArchipelagoAIOCB *aio_cb = (ArchipelagoAIOCB *) blockacb;
- aio_cb->cancelled = true;
- while (aio_cb->status == -EINPROGRESS) {
- aio_poll(bdrv_get_aio_context(aio_cb->common.bs), true);
- }
- qemu_aio_release(aio_cb);
-}
-
static const AIOCBInfo archipelago_aiocb_info = {
.aiocb_size = sizeof(ArchipelagoAIOCB),
- .cancel = qemu_archipelago_aio_cancel,
};
static int archipelago_submit_request(BDRVArchipelagoState *s,
@@ -888,7 +874,6 @@ static BlockDriverAIOCB
*qemu_archipelago_aio_rw(BlockDriverState *bs,
aio_cb->ret = 0;
aio_cb->s = s;
- aio_cb->cancelled = false;
aio_cb->status = -EINPROGRESS;
off = sector_num * BDRV_SECTOR_SIZE;
--
1.9.3
- [Qemu-devel] [PATCH v5 00/22] block: Asynchronous request cancellation, Fam Zheng, 2014/09/10
- [Qemu-devel] [PATCH v5 01/22] ide/ahci: Check for -ECANCELED in aio callbacks, Fam Zheng, 2014/09/10
- [Qemu-devel] [PATCH v5 02/22] block: Add refcnt in BlockDriverAIOCB, Fam Zheng, 2014/09/10
- [Qemu-devel] [PATCH v5 03/22] block: Add bdrv_aio_cancel_async, Fam Zheng, 2014/09/10
- [Qemu-devel] [PATCH v5 04/22] block: Drop bdrv_em_co_aiocb_info.cancel, Fam Zheng, 2014/09/10
- [Qemu-devel] [PATCH v5 05/22] block: Convert bdrv_em_aiocb_info.cancel to .cancel_async, Fam Zheng, 2014/09/10
- [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 <=
- [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, 2014/09/10
- [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