[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/17] mirror: Make mirror_co_discard() nicer
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 08/17] mirror: Make mirror_co_discard() nicer |
Date: |
Mon, 13 Aug 2018 04:19:57 +0200 |
Signed-off-by: Max Reitz <address@hidden>
---
block/mirror.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index df8e0242dc..85b08086cc 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -374,16 +374,13 @@ static int coroutine_fn mirror_co_zero(MirrorBlockJob *s,
s->unmap ? BDRV_REQ_MAY_UNMAP : 0);
}
-static void coroutine_fn mirror_co_discard(void *opaque)
+static int coroutine_fn mirror_co_discard(MirrorBlockJob *s,
+ int64_t offset, int64_t bytes)
{
- MirrorOp *op = opaque;
- int ret;
-
- op->s->in_flight++;
- op->s->bytes_in_flight += op->bytes;
+ s->in_flight++;
+ s->bytes_in_flight += bytes;
- ret = blk_co_pdiscard(op->s->target, op->offset, op->bytes);
- mirror_write_complete(op, ret);
+ return blk_co_pdiscard(s->target, offset, bytes);
}
static void coroutine_fn mirror_co_perform(void *opaque)
@@ -400,8 +397,8 @@ static void coroutine_fn mirror_co_perform(void *opaque)
ret = mirror_co_zero(s, op->offset, op->bytes);
break;
case MIRROR_METHOD_DISCARD:
- mirror_co_discard(opaque);
- return;
+ ret = mirror_co_discard(s, op->offset, op->bytes);
+ break;
default:
abort();
}
--
2.17.1
- [Qemu-devel] [PATCH 00/17] mirror: Mainly coroutine refinements, Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 01/17] iotests: Try reading while mirroring in 156, Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 02/17] mirror: Make wait_for_any_operation() coroutine_fn, Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 03/17] mirror: Pull *_align_for_copy() from *_co_read(), Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 04/17] mirror: Remove bytes_handled, part 1, Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 06/17] mirror: Create mirror_co_perform(), Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 05/17] mirror: Remove bytes_handled, part 2, Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 07/17] mirror: Make mirror_co_zero() nicer, Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 08/17] mirror: Make mirror_co_discard() nicer,
Max Reitz <=
- [Qemu-devel] [PATCH 09/17] mirror: Lock AioContext in mirror_co_perform(), Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 10/17] mirror: Create mirror_co_alloc_qiov(), Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 11/17] mirror: Inline mirror_write_complete(), part 1, Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 12/17] mirror: Put QIOV locally into mirror_co_read, Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 13/17] mirror: Linearize mirror_co_read(), Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 14/17] mirror: Inline mirror_iteration_done(), Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 15/17] mirror: Release AioCtx before queue_restart_all(), Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 17/17] iotests: Add test for active mirror with COR, Max Reitz, 2018/08/12