[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 06/12] block/qcow2: refactor qcow2_co_preadv_task() to have on
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v6 06/12] block/qcow2: refactor qcow2_co_preadv_task() to have one return |
Date: |
Thu, 22 Apr 2021 19:30:40 +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 7049f7fc3e..066d44e2be 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -2234,6 +2234,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:
@@ -2246,28 +2247,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 v6 00/12] qcow2: fix parallel rewrite and discard (lockless), Vladimir Sementsov-Ogievskiy, 2021/04/22
- [PATCH v6 02/12] qcow2: fix cache discarding in update_refcount(), Vladimir Sementsov-Ogievskiy, 2021/04/22
- [PATCH v6 01/12] iotests: add qcow2-discard-during-rewrite, Vladimir Sementsov-Ogievskiy, 2021/04/22
- [PATCH v6 03/12] block/qcow2-cluster: assert no data_file on compressed write path, Vladimir Sementsov-Ogievskiy, 2021/04/22
- [PATCH v6 04/12] block/qcow2-refcount: rename and publish update_refcount_discard(), Vladimir Sementsov-Ogievskiy, 2021/04/22
- [PATCH v6 05/12] block/qcow2: introduce qcow2_parse_compressed_cluster_descriptor(), Vladimir Sementsov-Ogievskiy, 2021/04/22
- [PATCH v6 06/12] block/qcow2: refactor qcow2_co_preadv_task() to have one return,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v6 08/12] qcow2: introduce is_cluster_free() helper, Vladimir Sementsov-Ogievskiy, 2021/04/22
- [PATCH v6 07/12] block/qcow2: qcow2_co_pwrite_zeroes: use QEMU_LOCK_GUARD, Vladimir Sementsov-Ogievskiy, 2021/04/22
- [PATCH v6 09/12] qcow2: introduce host-range-refs, Vladimir Sementsov-Ogievskiy, 2021/04/22
- [PATCH v6 10/12] qcow2: introduce qcow2_host_cluster_postponed_discard(), Vladimir Sementsov-Ogievskiy, 2021/04/22
- [PATCH v6 11/12] qcow2: protect data writing by host range reference, Vladimir Sementsov-Ogievskiy, 2021/04/22
- [PATCH v6 12/12] qcow2: protect data reading by host range reference, Vladimir Sementsov-Ogievskiy, 2021/04/22
- Re: [PATCH v6 00/12] qcow2: fix parallel rewrite and discard (lockless), Vladimir Sementsov-Ogievskiy, 2021/04/26