[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/10] blockjob: let ratelimit handle a speed of 0
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PULL 03/10] blockjob: let ratelimit handle a speed of 0 |
Date: |
Fri, 25 Jun 2021 15:59:59 +0300 |
From: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Message-Id: <20210614081130.22134-4-eesposit@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
blockjob.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/blockjob.c b/blockjob.c
index dc1d9e0e46..22e5bb9b1f 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -300,10 +300,6 @@ bool block_job_set_speed(BlockJob *job, int64_t speed,
Error **errp)
int64_t block_job_ratelimit_get_delay(BlockJob *job, uint64_t n)
{
- if (!job->speed) {
- return 0;
- }
-
return ratelimit_calculate_delay(&job->limit, n);
}
@@ -472,12 +468,9 @@ void *block_job_create(const char *job_id, const
BlockJobDriver *driver,
blk_set_disable_request_queuing(blk, true);
blk_set_allow_aio_context_change(blk, true);
- /* Only set speed when necessary to avoid NotSupported error */
- if (speed != 0) {
- if (!block_job_set_speed(job, speed, errp)) {
- job_early_fail(&job->job);
- return NULL;
- }
+ if (!block_job_set_speed(job, speed, errp)) {
+ job_early_fail(&job->job);
+ return NULL;
}
return job;
--
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 <=
- [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, 2021/06/25
- [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