[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 3/5] block-copy: move progress_set_remaining in block_copy_tas
From: |
Emanuele Giuseppe Esposito |
Subject: |
[PATCH v5 3/5] block-copy: move progress_set_remaining in block_copy_task_end |
Date: |
Thu, 24 Jun 2021 09:20:41 +0200 |
Moving this function in task_end ensures to update the progress
anyways, even if there is an error.
It also helps in next patch, allowing task_end to have only
one critical section.
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
block/block-copy.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/block/block-copy.c b/block/block-copy.c
index bbcc53ff70..d44c41549e 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -248,6 +248,9 @@ static void coroutine_fn block_copy_task_end(BlockCopyTask
*task, int ret)
bdrv_set_dirty_bitmap(task->s->copy_bitmap, task->offset, task->bytes);
}
QLIST_REMOVE(task, list);
+ progress_set_remaining(task->s->progress,
+ bdrv_get_dirty_count(task->s->copy_bitmap) +
+ task->s->in_flight_bytes);
qemu_co_queue_restart_all(&task->wait_queue);
}
@@ -638,9 +641,6 @@ block_copy_dirty_clusters(BlockCopyCallState *call_state)
}
if (s->skip_unallocated && !(ret & BDRV_BLOCK_ALLOCATED)) {
block_copy_task_end(task, 0);
- progress_set_remaining(s->progress,
- bdrv_get_dirty_count(s->copy_bitmap) +
- s->in_flight_bytes);
trace_block_copy_skip_range(s, task->offset, task->bytes);
offset = task_end(task);
bytes = end - offset;
--
2.31.1
- [PATCH v5 0/5] block-copy: protect block-copy internal structures, Emanuele Giuseppe Esposito, 2021/06/24
- [PATCH v5 1/5] block-copy: small refactor in block_copy_task_entry and block_copy_common, Emanuele Giuseppe Esposito, 2021/06/24
- [PATCH v5 2/5] block-copy: streamline choice of copy_range vs. read/write, Emanuele Giuseppe Esposito, 2021/06/24
- [PATCH v5 3/5] block-copy: move progress_set_remaining in block_copy_task_end,
Emanuele Giuseppe Esposito <=
- [PATCH v5 4/5] block-copy: add CoMutex lock, Emanuele Giuseppe Esposito, 2021/06/24
- [PATCH v5 5/5] block-copy: atomic .cancelled and .finished fields in BlockCopyCallState, Emanuele Giuseppe Esposito, 2021/06/24
- Re: [PATCH v5 0/5] block-copy: protect block-copy internal structures, Vladimir Sementsov-Ogievskiy, 2021/06/25
- Re: [PATCH v5 0/5] block-copy: protect block-copy internal structures, Vladimir Sementsov-Ogievskiy, 2021/06/25