[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 09/22] iscsi: Convert iscsi_aiocb_info.cancel to
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v6 09/22] iscsi: Convert iscsi_aiocb_info.cancel to .cancel_async |
Date: |
Thu, 11 Sep 2014 13:41:15 +0800 |
Also drop the unused field "canceled".
Signed-off-by: Fam Zheng <address@hidden>
---
block/iscsi.c | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/block/iscsi.c b/block/iscsi.c
index 3e19202..a0aca5f 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -88,7 +88,6 @@ typedef struct IscsiAIOCB {
struct scsi_task *task;
uint8_t *buf;
int status;
- int canceled;
int64_t sector_num;
int nb_sectors;
#ifdef __linux__
@@ -120,9 +119,7 @@ iscsi_bh_cb(void *p)
g_free(acb->buf);
acb->buf = NULL;
- if (acb->canceled == 0) {
- acb->common.cb(acb->common.opaque, acb->status);
- }
+ acb->common.cb(acb->common.opaque, acb->status);
if (acb->task != NULL) {
scsi_free_scsi_task(acb->task);
@@ -240,20 +237,15 @@ iscsi_aio_cancel(BlockDriverAIOCB *blockacb)
return;
}
- acb->canceled = 1;
-
/* send a task mgmt call to the target to cancel the task on the target */
iscsi_task_mgmt_abort_task_async(iscsilun->iscsi, acb->task,
iscsi_abort_task_cb, acb);
- while (acb->status == -EINPROGRESS) {
- aio_poll(iscsilun->aio_context, true);
- }
}
static const AIOCBInfo iscsi_aiocb_info = {
.aiocb_size = sizeof(IscsiAIOCB),
- .cancel = iscsi_aio_cancel,
+ .cancel_async = iscsi_aio_cancel,
};
@@ -638,10 +630,6 @@ iscsi_aio_ioctl_cb(struct iscsi_context *iscsi, int status,
g_free(acb->buf);
acb->buf = NULL;
- if (acb->canceled != 0) {
- return;
- }
-
acb->status = 0;
if (status < 0) {
error_report("Failed to ioctl(SG_IO) to iSCSI lun. %s",
@@ -683,7 +671,6 @@ static BlockDriverAIOCB *iscsi_aio_ioctl(BlockDriverState
*bs,
acb = qemu_aio_get(&iscsi_aiocb_info, bs, cb, opaque);
acb->iscsilun = iscsilun;
- acb->canceled = 0;
acb->bh = NULL;
acb->status = -EINPROGRESS;
acb->buf = NULL;
--
1.9.3
- [Qemu-devel] [PATCH v6 00/22] block: Asynchronous request cancellation, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 01/22] ide/ahci: Check for -ECANCELED in aio callbacks, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 02/22] block: Add refcnt in BlockDriverAIOCB, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 03/22] block: Add bdrv_aio_cancel_async, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 04/22] block: Drop bdrv_em_co_aiocb_info.cancel, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 05/22] block: Drop bdrv_em_aiocb_info.cancel, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 06/22] thread-pool: Convert thread_pool_aiocb_info.cancel to cancel_async, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 07/22] linux-aio: Convert laio_aiocb_info.cancel to .cancel_async, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 08/22] dma: Convert dma_aiocb_info.cancel to .cancel_async, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 09/22] iscsi: Convert iscsi_aiocb_info.cancel to .cancel_async,
Fam Zheng <=
- [Qemu-devel] [PATCH v6 10/22] archipelago: Drop archipelago_aiocb_info.cancel, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 11/22] blkdebug: Drop blkdebug_aiocb_info.cancel, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 12/22] blkverify: Drop blkverify_aiocb_info.cancel, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 13/22] curl: Drop curl_aiocb_info.cancel, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 14/22] qed: Drop qed_aiocb_info.cancel, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 15/22] quorum: fix quorum_aio_cancel(), Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 16/22] quorum: Convert quorum_aiocb_info.cancel to .cancel_async, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 17/22] rbd: Drop rbd_aiocb_info.cancel, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 18/22] sheepdog: Convert sd_aiocb_info.cancel to .cancel_async, Fam Zheng, 2014/09/11