[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 06/15] block/mirror: conservative mirror_exit ref
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v3 06/15] block/mirror: conservative mirror_exit refactor |
Date: |
Fri, 31 Aug 2018 18:28:58 -0400 |
For purposes of minimum code movement, refactor the mirror_exit
callback to use the post-finalization callbacks in a trivial way.
Signed-off-by: John Snow <address@hidden>
---
block/mirror.c | 31 +++++++++++++++++++++++++------
1 file changed, 25 insertions(+), 6 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index c164fee883..5067f1764d 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -79,6 +79,7 @@ typedef struct MirrorBlockJob {
int max_iov;
bool initial_zeroing_ongoing;
int in_active_write_counter;
+ bool prepared;
} MirrorBlockJob;
typedef struct MirrorBDSOpaque {
@@ -607,7 +608,7 @@ static void mirror_wait_for_all_io(MirrorBlockJob *s)
}
}
-static void mirror_exit(Job *job)
+static int mirror_exit_common(Job *job)
{
MirrorBlockJob *s = container_of(job, MirrorBlockJob, common.job);
BlockJob *bjob = &s->common;
@@ -617,7 +618,13 @@ static void mirror_exit(Job *job)
BlockDriverState *target_bs = blk_bs(s->target);
BlockDriverState *mirror_top_bs = s->mirror_top_bs;
Error *local_err = NULL;
- int ret = job->ret;
+ bool abort = !!job->ret;
+ int ret = 0;
+
+ if (s->prepared) {
+ return 0;
+ }
+ s->prepared = true;
bdrv_release_dirty_bitmap(src, s->dirty_bitmap);
@@ -648,7 +655,7 @@ static void mirror_exit(Job *job)
aio_context_acquire(replace_aio_context);
}
- if (s->should_complete && ret == 0) {
+ if (s->should_complete && !abort) {
BlockDriverState *to_replace = s->to_replace ? s->to_replace : src;
if (s->backing_mode == MIRROR_SOURCE_BACKING_CHAIN) {
@@ -712,7 +719,17 @@ static void mirror_exit(Job *job)
bdrv_unref(mirror_top_bs);
bdrv_unref(src);
- job->ret = ret;
+ return ret;
+}
+
+static int mirror_prepare(Job *job)
+{
+ return mirror_exit_common(job);
+}
+
+static void mirror_abort(Job *job)
+{
+ assert(mirror_exit_common(job) == 0);
}
static void mirror_throttle(MirrorBlockJob *s)
@@ -1133,7 +1150,8 @@ static const BlockJobDriver mirror_job_driver = {
.user_resume = block_job_user_resume,
.drain = block_job_drain,
.run = mirror_run,
- .exit = mirror_exit,
+ .prepare = mirror_prepare,
+ .abort = mirror_abort,
.pause = mirror_pause,
.complete = mirror_complete,
},
@@ -1150,7 +1168,8 @@ static const BlockJobDriver commit_active_job_driver = {
.user_resume = block_job_user_resume,
.drain = block_job_drain,
.run = mirror_run,
- .exit = mirror_exit,
+ .prepare = mirror_prepare,
+ .abort = mirror_abort,
.pause = mirror_pause,
.complete = mirror_complete,
},
--
2.14.4
- [Qemu-devel] [PATCH v3 00/15] jobs: Job Exit Refactoring Pt 2, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 08/15] tests/blockjob: replace Blockjob with Job, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 11/15] jobs: remove .exit callback, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 13/15] qapi/block-mirror: expose new job properties, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 05/15] block/mirror: don't install backing chain on abort, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 14/15] qapi/block-stream: expose new job properties, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 09/15] tests/test-blockjob: remove exit callback, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 12/15] qapi/block-commit: expose new job properties, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 06/15] block/mirror: conservative mirror_exit refactor,
John Snow <=
- [Qemu-devel] [PATCH v3 15/15] block/backup: qapi documentation fixup, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 03/15] block/stream: add block job creation flags, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 04/15] block/commit: refactor commit to use job callbacks, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 10/15] tests/test-blockjob-txn: move .exit to .clean, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 01/15] block/commit: add block job creation flags, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 02/15] block/mirror: add block job creation flags, John Snow, 2018/08/31