[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 05/11] qcow2: refactor qcow2_co_preadv_task() to have one retu
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v7 05/11] qcow2: refactor qcow2_co_preadv_task() to have one return |
Date: |
Sat, 4 Sep 2021 19:24:22 +0300 |
We are going to add an action before return for this function. Refactor
function now to make further patch simpler.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/qcow2.c | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 2095188b6f..7fbcc600da 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -2262,6 +2262,7 @@ static coroutine_fn int
qcow2_co_preadv_task(BlockDriverState *bs,
size_t qiov_offset)
{
BDRVQcow2State *s = bs->opaque;
+ int ret;
switch (subc_type) {
case QCOW2_SUBCLUSTER_ZERO_PLAIN:
@@ -2274,28 +2275,31 @@ static coroutine_fn int
qcow2_co_preadv_task(BlockDriverState *bs,
assert(bs->backing); /* otherwise handled in qcow2_co_preadv_part */
BLKDBG_EVENT(bs->file, BLKDBG_READ_BACKING_AIO);
- return bdrv_co_preadv_part(bs->backing, offset, bytes,
- qiov, qiov_offset, 0);
+ ret = bdrv_co_preadv_part(bs->backing, offset, bytes,
+ qiov, qiov_offset, 0);
+ break;
case QCOW2_SUBCLUSTER_COMPRESSED:
- return qcow2_co_preadv_compressed(bs, host_offset,
- offset, bytes, qiov, qiov_offset);
+ ret = qcow2_co_preadv_compressed(bs, host_offset,
+ offset, bytes, qiov, qiov_offset);
+ break;
case QCOW2_SUBCLUSTER_NORMAL:
if (bs->encrypted) {
- return qcow2_co_preadv_encrypted(bs, host_offset,
- offset, bytes, qiov, qiov_offset);
+ ret = qcow2_co_preadv_encrypted(bs, host_offset,
+ offset, bytes, qiov, qiov_offset);
+ } else {
+ BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO);
+ ret = bdrv_co_preadv_part(s->data_file, host_offset,
+ bytes, qiov, qiov_offset, 0);
}
-
- BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO);
- return bdrv_co_preadv_part(s->data_file, host_offset,
- bytes, qiov, qiov_offset, 0);
+ break;
default:
g_assert_not_reached();
}
- g_assert_not_reached();
+ return ret;
}
static coroutine_fn int qcow2_co_preadv_task_entry(AioTask *task)
--
2.29.2
- [PATCH v7 00/11] qcow2: fix parallel rewrite and discard (reqlist), Vladimir Sementsov-Ogievskiy, 2021/09/04
- [PATCH v7 02/11] block/reqlist: add reqlist_new_req() and reqlist_free_req(), Vladimir Sementsov-Ogievskiy, 2021/09/04
- [PATCH v7 01/11] block/reqlist: drop extra assertion, Vladimir Sementsov-Ogievskiy, 2021/09/04
- [PATCH v7 03/11] iotests: add qcow2-discard-during-rewrite, Vladimir Sementsov-Ogievskiy, 2021/09/04
- [PATCH v7 04/11] qcow2: introduce qcow2_parse_compressed_cluster_descriptor(), Vladimir Sementsov-Ogievskiy, 2021/09/04
- [PATCH v7 05/11] qcow2: refactor qcow2_co_preadv_task() to have one return,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v7 06/11] qcow2: prepare for tracking guest io requests in data_file, Vladimir Sementsov-Ogievskiy, 2021/09/04
- [PATCH v7 08/11] qcow2: introduce is_cluster_free() helper, Vladimir Sementsov-Ogievskiy, 2021/09/04
- [PATCH v7 07/11] qcow2: track guest io requests in data_file, Vladimir Sementsov-Ogievskiy, 2021/09/04
- [PATCH v7 10/11] block/reqlist: implement reqlist_mark_req_invalid(), Vladimir Sementsov-Ogievskiy, 2021/09/04
- [PATCH v7 09/11] qcow2: don't reallocate host clusters under guest operation, Vladimir Sementsov-Ogievskiy, 2021/09/04
- [PATCH v7 11/11] qcow2: use reqlist_mark_req_invalid(), Vladimir Sementsov-Ogievskiy, 2021/09/04
- Re: [PATCH v7 00/11] qcow2: fix parallel rewrite and discard (reqlist), Vladimir Sementsov-Ogievskiy, 2021/09/22