[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/13] block/mirror: condense cancellation and re
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v2 10/13] block/mirror: condense cancellation and relax calls |
Date: |
Fri, 19 Jan 2018 15:58:44 -0500 |
We can count on the relax call to check cancellation for us, so
condense these concurrent calls.
Signed-off-by: John Snow <address@hidden>
---
block/mirror.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index 3c73caed5e..a0e0044de2 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -610,9 +610,7 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)
int bytes = MIN(s->bdev_length - offset,
QEMU_ALIGN_DOWN(INT_MAX, s->granularity));
- block_job_relax(&s->common, 0);
-
- if (block_job_is_cancelled(&s->common)) {
+ if (block_job_relax(&s->common, 0)) {
s->initial_zeroing_ongoing = false;
return 0;
}
@@ -638,9 +636,7 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)
int bytes = MIN(s->bdev_length - offset,
QEMU_ALIGN_DOWN(INT_MAX, s->granularity));
- block_job_relax(&s->common, 0);
-
- if (block_job_is_cancelled(&s->common)) {
+ if (block_job_relax(&s->common, 0)) {
return 0;
}
--
2.14.3
- [Qemu-devel] [PATCH v2 00/13] blockjob: refactor mirror_throttle, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 02/13] blockjob: consolidate SLICE_TIME definition, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 03/13] blockjob: create block_job_relax, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 01/13] blockjob: record time of last entrance, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 05/13] block/commit: use block_job_relax, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 04/13] blockjob: allow block_job_throttle to take delay_ns, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 06/13] block/stream: use block_job_relax, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 07/13] block/backup: use block_job_relax, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 08/13] allow block_job_relax to return -ECANCELED, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 09/13] block/backup: remove yield_and_check, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 10/13] block/mirror: condense cancellation and relax calls,
John Snow <=
- [Qemu-devel] [PATCH v2 12/13] blockjob: privatize block_job_sleep_ns, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 11/13] block/mirror: remove block_job_sleep_ns calls, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 13/13] blockjob: remove block_job_pause_point from interface, John Snow, 2018/01/19
- Re: [Qemu-devel] [PATCH v2 00/13] blockjob: refactor mirror_throttle, no-reply, 2018/01/19
- Re: [Qemu-devel] [PATCH v2 00/13] blockjob: refactor mirror_throttle, John Snow, 2018/01/30