[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/10] block-copy: small refactor in block_copy_task_entry and blo
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PULL 06/10] block-copy: small refactor in block_copy_task_entry and block_copy_common |
Date: |
Fri, 25 Jun 2021 16:00:02 +0300 |
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Use a local variable instead of referencing BlockCopyState through a
BlockCopyCallState or BlockCopyTask every time.
This is in preparation for next patches.
No functional change intended.
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Message-Id: <20210624072043.180494-2-eesposit@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/block-copy.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/block/block-copy.c b/block/block-copy.c
index 020f9846d8..a437978e35 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -452,14 +452,15 @@ static void
block_copy_handle_copy_range_result(BlockCopyState *s,
static coroutine_fn int block_copy_task_entry(AioTask *task)
{
BlockCopyTask *t = container_of(task, BlockCopyTask, task);
+ BlockCopyState *s = t->s;
bool error_is_read = false;
bool copy_range = t->copy_range;
int ret;
- ret = block_copy_do_copy(t->s, t->offset, t->bytes, t->zeroes,
+ ret = block_copy_do_copy(s, t->offset, t->bytes, t->zeroes,
©_range, &error_is_read);
if (t->copy_range) {
- block_copy_handle_copy_range_result(t->s, copy_range);
+ block_copy_handle_copy_range_result(s, copy_range);
}
if (ret < 0) {
if (!t->call_state->ret) {
@@ -467,9 +468,9 @@ static coroutine_fn int block_copy_task_entry(AioTask *task)
t->call_state->error_is_read = error_is_read;
}
} else {
- progress_work_done(t->s->progress, t->bytes);
+ progress_work_done(s->progress, t->bytes);
}
- co_put_to_shres(t->s->mem, t->bytes);
+ co_put_to_shres(s->mem, t->bytes);
block_copy_task_end(t, ret);
return ret;
@@ -714,14 +715,15 @@ void block_copy_kick(BlockCopyCallState *call_state)
static int coroutine_fn block_copy_common(BlockCopyCallState *call_state)
{
int ret;
+ BlockCopyState *s = call_state->s;
- QLIST_INSERT_HEAD(&call_state->s->calls, call_state, list);
+ QLIST_INSERT_HEAD(&s->calls, call_state, list);
do {
ret = block_copy_dirty_clusters(call_state);
if (ret == 0 && !call_state->cancelled) {
- ret = block_copy_wait_one(call_state->s, call_state->offset,
+ ret = block_copy_wait_one(s, call_state->offset,
call_state->bytes);
}
--
2.29.2
- [PULL 00/10] Block Jobs patches, Vladimir Sementsov-Ogievskiy, 2021/06/25
- [PULL 01/10] ratelimit: treat zero speed as unlimited, Vladimir Sementsov-Ogievskiy, 2021/06/25
- [PULL 07/10] block-copy: streamline choice of copy_range vs. read/write, Vladimir Sementsov-Ogievskiy, 2021/06/25
- [PULL 03/10] blockjob: let ratelimit handle a speed of 0, Vladimir Sementsov-Ogievskiy, 2021/06/25
- [PULL 08/10] block-copy: move progress_set_remaining in block_copy_task_end, Vladimir Sementsov-Ogievskiy, 2021/06/25
- [PULL 05/10] co-shared-resource: protect with a mutex, Vladimir Sementsov-Ogievskiy, 2021/06/25
- [PULL 04/10] progressmeter: protect with a mutex, Vladimir Sementsov-Ogievskiy, 2021/06/25
- [PULL 06/10] block-copy: small refactor in block_copy_task_entry and block_copy_common,
Vladimir Sementsov-Ogievskiy <=
- [PULL 10/10] block-copy: atomic .cancelled and .finished fields in BlockCopyCallState, Vladimir Sementsov-Ogievskiy, 2021/06/25
- [PULL 02/10] block-copy: let ratelimit handle a speed of 0, Vladimir Sementsov-Ogievskiy, 2021/06/25
- [PULL 09/10] block-copy: add CoMutex lock, Vladimir Sementsov-Ogievskiy, 2021/06/25
- Re: [PULL 00/10] Block Jobs patches, Peter Maydell, 2021/06/28
- Re: [PULL 00/10] Block Jobs patches, Peter Maydell, 2021/06/28