[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/11] scsi: Fix scsi_req_cancel_async for no aiocb r
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 10/11] scsi: Fix scsi_req_cancel_async for no aiocb req |
Date: |
Fri, 30 Jan 2015 16:01:17 +0100 |
From: Fam Zheng <address@hidden>
scsi_req_cancel_complete is responsible for releasing the request, so we
shouldn't skip it in any case. This doesn't affect the only existing
caller, virtio-scsi, but is useful for other devices once they use it.
Suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi/scsi-bus.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index 9b740a3..db39ae0 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -1756,6 +1756,8 @@ void scsi_req_cancel_async(SCSIRequest *req, Notifier
*notifier)
req->io_canceled = true;
if (req->aiocb) {
blk_aio_cancel_async(req->aiocb);
+ } else {
+ scsi_req_cancel_complete(req);
}
}
--
1.8.3.1
- [Qemu-devel] [PULL 02/11] rcu: add rcutorture, (continued)
- [Qemu-devel] [PULL 02/11] rcu: add rcutorture, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 03/11] rcu: allow nesting of rcu_read_lock/rcu_read_unlock, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 01/11] rcu: add rcu library, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 05/11] memory: remove assertion on memory_region_destroy, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 06/11] memory: protect current_map by RCU, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 08/11] cpu-exec: simplify align_clocks, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 04/11] rcu: add call_rcu, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 09/11] cpu-exec: simplify init_delay_params, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 07/11] memory: avoid ref/unref in memory_region_find, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 11/11] configure: Default to enable module build, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 10/11] scsi: Fix scsi_req_cancel_async for no aiocb req,
Paolo Bonzini <=
- [Qemu-devel] [PULL 00/11] RCU, scsi, modules, icount changes for 2015-01-30, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 02/11] rcu: add rcutorture, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 01/11] rcu: add rcu library, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 04/11] rcu: add call_rcu, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 06/11] memory: protect current_map by RCU, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 07/11] memory: avoid ref/unref in memory_region_find, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 03/11] rcu: allow nesting of rcu_read_lock/rcu_read_unlock, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 08/11] cpu-exec: simplify align_clocks, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 05/11] memory: remove assertion on memory_region_destroy, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 10/11] scsi: Fix scsi_req_cancel_async for no aiocb req, Paolo Bonzini, 2015/01/30