[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v10 6/9] scsi: move unmap error checking to the complete callback
From: |
Anton Nefedov |
Subject: |
[PATCH v10 6/9] scsi: move unmap error checking to the complete callback |
Date: |
Mon, 23 Sep 2019 15:17:34 +0300 |
This will help to account the operation in the following commit.
The difference is that we don't call scsi_disk_req_check_error() before
the 1st discard iteration anymore. That function also checks if
the request is cancelled, however it shouldn't get canceled until it
yields in blk_aio() functions anyway.
Same approach is already used for emulate_write_same.
Signed-off-by: Anton Nefedov <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
---
hw/scsi/scsi-disk.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index b3dd21800d..a002fdabe8 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -1610,9 +1610,6 @@ static void scsi_unmap_complete_noio(UnmapCBData *data,
int ret)
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
assert(r->req.aiocb == NULL);
- if (scsi_disk_req_check_error(r, ret, false)) {
- goto done;
- }
if (data->count > 0) {
r->sector = ldq_be_p(&data->inbuf[0])
@@ -1650,7 +1647,12 @@ static void scsi_unmap_complete(void *opaque, int ret)
r->req.aiocb = NULL;
aio_context_acquire(blk_get_aio_context(s->qdev.conf.blk));
- scsi_unmap_complete_noio(data, ret);
+ if (scsi_disk_req_check_error(r, ret, false)) {
+ scsi_req_unref(&r->req);
+ g_free(data);
+ } else {
+ scsi_unmap_complete_noio(data, ret);
+ }
aio_context_release(blk_get_aio_context(s->qdev.conf.blk));
}
--
2.17.1
- [PATCH v10 0/9] discard blockstats, Anton Nefedov, 2019/09/23
- [PATCH v10 7/9] scsi: account unmap operations, Anton Nefedov, 2019/09/23
- [PATCH v10 9/9] qapi: query-blockstat: add driver specific file-posix stats, Anton Nefedov, 2019/09/23
- [PATCH v10 4/9] ide: account UNMAP (TRIM) operations, Anton Nefedov, 2019/09/23
- [PATCH v10 8/9] file-posix: account discard operations, Anton Nefedov, 2019/09/23
- [PATCH v10 2/9] qapi: add unmap to BlockDeviceStats, Anton Nefedov, 2019/09/23
- [PATCH v10 6/9] scsi: move unmap error checking to the complete callback,
Anton Nefedov <=
- [PATCH v10 5/9] scsi: store unmap offset and nb_sectors in request struct, Anton Nefedov, 2019/09/23
- [PATCH v10 1/9] qapi: group BlockDeviceStats fields, Anton Nefedov, 2019/09/23
- [PATCH v10 3/9] block: add empty account cookie type, Anton Nefedov, 2019/09/23
- Re: [PATCH v10 0/9] discard blockstats, Max Reitz, 2019/09/23